merge
Merge branch 'master' of https://github.com/assasin190/ICECardWar

Conflicts:
	src/main/Battlefield.java