added changes
Merge branch 'master' of https://github.com/b-small/TeamAllusah

Conflicts:
	2DShooter/2DShooter.v12.suo