updated doughnut routes
Merge branch 'master' into backend
Merge prettier into backend
Merge branch 'master' into backend
Implemented settings and updated data with settings
Updated donut to match settings options
Finished statistics page
Finished Calendar
Implemented View activity
Finished up editing and deleting
updated a small bug
Added meta tag for iphone
adding iphone meta keywords
Updated facebook to be locally
Merge pull request #11 from chushao/backend

Backend