Fixed shield bug
Merge branch 'master' of https://github.com/jczarnowski/SpaceShooter
Merge branch 'master' of https://github.com/jczarnowski/SpaceShooter

Conflicts:
	src/com/jcf/spaceshooter/model/SpaceShuttle.java