Sam's badass testing of coffee script
Merge branch 'master' of https://github.com/felina/server