added stuff
hate this
Merge branch 'master' of https://github.com/ethanclevenger91/Doppelganger
yay
Revert to 2d6b8263d1
Revert to b02c30ae84
Revert to b8de7a15db
Merge branch 'claytonContribution'