removed email field from signup-login template
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
get rid of email
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
Merge branch 'master' of https://github.com/Fittr/fittr
solved issue where only one user's chart was being displayed
refactored the chart generation portion of the cards template. now we using an ng-repeat to generate charts based on a statCategory collection
modified to fix test
Merge pull request #71 from stateoflux/master

solved issue where only one user's chart was being displayed
route fix
Merge branch 'master' of https://github.com/Fittr/fittr
boom
Merge pull request #73 from Hendrixer/master

fix db routes
resolved merge conflict on cards.html
Merge branch 'master' of https://github.com/Fittr/fittr into stylin