Revert "Scott in credits"

This reverts commit 085c13b41e09d27868d11798c324562d116cbd45.
Revert "Revert "Scott in credits""

This reverts commit ebaa032ec1028fc610fa9bfc7fd7acf80bc7615c.
Merge branch 'master' of https://github.com/mgruesbeck/melvin-gruesbeck
fix push error