Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta

Conflicts:
	main.py
	mlpccg/CardDb.pyc
	mlpccg/Clustering.py
	mlpccg/Clustering.pyc
	mlpccg/DeckList.pyc
	static/index.html

diff --combined .gitignore
index 0000000,0000000..2f78cf5
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,2 @@@
++*.pyc
++

diff --combined mlpccg/CardDb.pyc
index ec143fa,43053dc..0000000
deleted file mode 100644,100644
Binary files differ

diff --combined mlpccg/Clustering.pyc
index 018b492,ddaa61a..0000000
deleted file mode 100644,100644
Binary files differ

diff --combined mlpccg/DeckList.pyc
index 29d8135,92c4384..0000000
deleted file mode 100644,100644
Binary files differ

diff --combined mlpccg/__init__.pyc
index 35dc891,35dc891..0000000
deleted file mode 100644,100644
Binary files differ