First Commit 2: Second Commit

2nd comm2it
Merge branch 'master' of https://github.com/greatherorift/ggj2014