basic parsefromfile functionality, still under construction
Merge branch 'master' of https://github.com/zemetheus/Magic

Conflicts:
	bin/Card.class
	src/Card.java
no message
Merge branch 'master' of https://github.com/zemetheus/Magic

Conflicts:
	bin/AddCardWindow.class
	src/AddCardWindow.java