asd
Merge branch 'master' of https://github.com/hdimitrieski/JustShootMe.git
Merge branch 'master' of https://github.com/hdimitrieski/JustShootMe.git

Conflicts:
	Client/js/Game/main.js
acz
Merge branch 'master' of https://github.com/hdimitrieski/JustShootMe.git