testing out why i cant pull
new branch: zachbranch
renamed Main state to Main_Gameplay
added terrainmap
Creating adamBranch
Got a crappy map generation made, added an input object to main gameplay
Added collision detection for a point in terrainmap
added inefficient exsplosion method for circles
added a test for the exsplosion
Merge branch 'master' into SteinBranch
test changes
added res folder
Merge branch 'master' into SteinBranch
created Tank class
Merge branch 'AdamBranch'
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'