my commit messsage
Merge https://github.com/luishexen/Game-Jam-2014