adding more stuff
Merge branch 'master' of https://github.com/rchenmit/mustached-octo-happiness