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
playing around with colors and some general code cleanup
integrated the nvd3 library and implemented a simple example chart on a card
specified the version of angular to install (to correct issue with travis)
another attempt at fixing the travis issue
no comment
modfied resolutions block within bower.json to match option 2
modfied resolutions block with nvd3 dependancy
typo :/
...
still trying to fix the bower dependancey issue
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