did a shit ton of shit
Merge branch 'master' of github.com:keyanbagheri/eat_me