merge
added doubleJump function for ai
got rid of some debugging code
merge
Merge ece2524.ece.vt.edu:torsten/project into torsten-project
Merge branch 'torsten-project' into zac-project
Merge branch 'zac-project'