Merge branch 'master' of https://github.com/kholcomb/OSWars

Conflicts:
	.gitignore
Added Icons and Sounds
Merge branch 'master' of https://github.com/kholcomb/OSWars

Conflicts:
	.gitignore