Slowly getting there with the README...
Merge branch 'master' of https://github.com/johnsogg/cs1300