we win
Merge branch 'master' of https://github.com/lucyanne/timebuddy

Conflicts:
	routes/db_addactivitydata.js
prog bars