Christians stuff
Merge branch 'master' of github.com:krf/coma2012