- changed some strings
Merge branch 'master' of https://github.com/vernonrj/mustached-octo-hipster