cleaned up some code
Merge pull request #58 from ryanadair009/master

Movement FSM overhaul
gui stuff
adding ability1
Merge remote-tracking branch 'upstream/master'