Bitmap Additions and implementations
Fixed it so space does not shoot and jump at the same time.
Merge remote-tracking branch 'origin/master' into Joshie
Changed size of gun to 276 by 276

In resource folder
Merge branch 'Joshie'
Merge branch 'master' of https://github.com/tylerfelker/SoftwareEngineeringProject
Merge remote-tracking branch 'origin/master' into tyler
Added in the shoot functionality to the characters and added in the boss characters special functionality.
Merge remote-tracking branch 'origin/Wes'
Got most of the npc - player interactions done. The only main thing I can think of to do next is to make the npcs run at the player.
Merge branch 'master' of https://github.com/tylerfelker/SoftwareEngineeringProject
Merge remote-tracking branch 'origin/master' into tyler