powerup capabilities, splash screen
beginning bomb
Merge branch 'master' of github.com:GraspSilv/1943project

Conflicts:
	main.cpp
Merge branch 'master' of github.com:GraspSilv/1943project