Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014