added stuff
Merge branch 'master' of https://github.com/kolauren/monkeyhouse_hackathon

merge
aded some things