Interface for army options complete
Merge branch 'master' of https://github.com/Alyanorno/Awesome-game

Conflicts:
	Source/input.cpp