my changes
added to index
my changes
Merge branch 'master' of https://github.com/brudi07/Card.git

Conflicts:
	src/main/Main.java
>_<