stashing
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014
Merge pull request #37 from Kierz/master

making sure me and dan are uptodate