merge
trivial
Merge branch 'master' of https://github.com/alexpien/hackduke2013
removed coffeescript
Merge branch 'master' of https://github.com/alexpien/hackduke2013