national flags
Merge branch 'master' of https://github.com/glc12125/History

Conflicts:
	.classpath
	src/appathon/history/models/GameManager.java
	src/appathon/history/models/User.java