Cleanup
Merge branch 'master' of github.com:tlein/GameJam2013
Merge branch 'tucker'
Doing tuckers job