Large amount of UI work
Merge branch 'master' of https://github.com/Bitzeralisis/HackAtBrown2014