changed color of header bar
api routes
test
Merge pull request #52 from Hendrixer/server

Server and stuff
fix bug
fixes issue with the login error flow. I was not passing .user to ValidationService.resetForm
sucessfully moved the getUserActivity helper function into the UserService object
Merge branch 'master' of https://github.com/Fittr/fittr
removed the reference to the dangle library
modified chartController test data in an attempt to mimic 7 days of step data
added config statement to fix a CORS issue found on Heroku
removed search; removed swipe in topBar; add user photo and dummy stats
Merge pull request #53 from stateoflux/master

Fixed some misc issues
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction

Conflicts:
	public/js/src/app.js
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction
Merge pull request #54 from sudostack/cardaction

removed search; removed swipe in topBar; add user photo and dummy stats
cleaned up some code
differentials work with dummy data
redirect logged-in users to /main/stream
Merge pull request #55 from sudostack/cardaction

Cardaction - differentials w/ colors