attemp to connect data received from backend to frontend
to fix merge conflicts
changed urls back to localhost
Merge pull request #81 from Hendrixer/dev

setup for local
removed logic to save user activity to local storage
Merge branch 'master' of https://github.com/Fittr/fittr
able to retrieve user activity data from api and display in topBar template
Merge pull request #82 from stateoflux/master

able to retrieve user activity data from api and display in topBar template
removed unneccesary files and bugfixes
Merge pull request #84 from sarchila/master

removed unneccesary files and bugfixes
fixes issue where user is always taken to login upon landing
modified cardsController and cards template such that currentUser data and the user stream data is displayed correctly.  still need to work on connecting the stats data to the charts.
Merge pull request #85 from sarchila/master

fixes issue where user is always taken to login upon landing
minor cleanup
Merge branch 'master' of https://github.com/Fittr/fittr
Merge pull request #86 from stateoflux/master

modified cardsController and cards template such that currentUser data
rid off
Merge branch 'master' of https://github.com/Fittr/fittr into dev
stuff
merge