Stuff
Merge branch 'master' of https://github.com/poidude7/HelloWorld.git

Conflicts:
	AgeOfWar/age_of_war/code/War.java