Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Update the package import
Added Space Shooter in .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore