less shitty design (barely)
Merge branch 'master' of https://github.com/HackNC2014/pulse-hacknc