Little bit of cleanup
Merge branch 'master' of https://github.com/Transfinity/MHacks_Iris
Messin about, makin it better