Updates
Merge branch 'master' of https://github.com/alendamadzic/squad

Conflicts:
	main.cpp