first commit
Merge branch 'master' of https://github.com/solitaire12/freezing-octo-bugfixes