Adding modules and objects.
Merge branch 'master' of github.com:seanmacdonaill/ggj14