Merge pull request #137 from jamesongamble/master

Combines Track and Stop into one view. Cleans up unnecessary controllers in services.js
Changes color scheme
Fixes login color scheme