Modified namespace
Merge branch 'master' of https://github.com/bennychen/gamejam2014