Dev commit
devel commit
Merge branch 'Development'
Second commit
Merge branch 'master' of https://github.com/asanyal902/SpaceInvaders.git
3rd commit
All conflicts resolved
Merge branch 'master' of https://github.com/asanyal902/SpaceInvaders.git

Conflicts:
	SpaceInvaders/.project