Merge branch 'master' of https://github.com/bokken12/Cards

Conflicts:
	src/Main.java
resolved conflict