Merge pull request #38 from slkennedy/sara-master

Sara master
gulp builds
Fixes conflicts
Revert "Adds health meters and More styling"

This reverts commit d1410df0482339acdd7f70526c56f18fa4295640.
Deletes stuff
Revert to working state