the error is cuz theres an xbox... idk if we're gonna use it again so I left it in there
Merge branch 'master' of github.com:jonbuckley33/BadRobot2013.git