fixed calories not having a number when activeSlide is undefined
fixed calories not having a number when activeSlide is undefined
topBarController updated to account for 0
Merge branch 'cardaction' of https://github.com/sudostack/fittr into cardaction
fixed calories not having a number when activeSlide is undefined
topBarController updated to account for 0
little progress; just saving
Merge branch 'cardaction' of https://github.com/sudostack/fittr into cardaction

Conflicts:
	public/js/src/controllers/topBarController.js
Merge pull request #43 from stateoflux/master

Several changes related to client side testing
removed all the pet stuff
Merge pull request #46 from stateoflux/master

Integrated the NVD3 library and implemented a simple example chart on a card
more cleanup
Merge branch 'master' of https://github.com/Fittr/fittr into cardaction

Conflicts:
	index.html
	public/js/src/app.js
missing comma
fixed another syntax error at ln 85 of app.js
Merge pull request #51 from sudostack/cardaction

Cardaction - Removed all pet stuff
api routes
test
Merge pull request #52 from Hendrixer/server

Server and stuff
fix bug