progress
Merge branch 'master' of https://github.com/Kah0ona/slate_tyrex