(feat) Add 'stats' route with hello world
Minor changes
minor changes
Merge pull request #22 from celineotter/master

Refactoring within controller and factory desktop directory
(feat) Add dummy chart to 'stats' page
(feat) add /stats/route route and subroutes, charts
Added etrieveSevenDaysStats() for stats routes, first edition, draft
Added googleChart folder and stats folders
(feat) Add remaning charts to 'stats' route with dummy data
Merge branch 'master' of https://github.com/fitstats/fitstats into feat/stats

Conflicts:
	client/app/dashboard/dashboard.controller.js
Merge pull request #23 from andrewzey/feat/stats

(feat) Add 'stats' route and subroutes
Merge branch 'master' of https://github.com/fitstats/fitstats

Conflicts:
	client/app/stats/stats.html
	client/app/stats/stats.js
	client/index.html
modified stats files, added stats.service.js
adjusted stats controller and service, adjusted googleChart constroller and index
Merge branch 'master' of https://github.com/fitstats/fitstats
Merge pull request #24 from xianhuifeng/master

Added googleChart folder for server side fetching data
Refactor-minor
Merge branch 'master' of https://github.com/fitstats/fitstats