Added parameters to prevent crashing upon map generation (hopefully)
Added superclass for shots so we can create weapons
Changed the radius of effect to area of effect since circle shots should
extend this. Using Shape right now for the area. May change.
Building heirarchy for circular shots. Still a lot of work to go
Merge remote-tracking branch 'origin/master'