users
authenicated.
Merge branch 'master' of github.com:startupbus-roll/sideproject
colors
Merge branch 'master' of github.com:startupbus-roll/sideproject

Conflicts:
	views/buddy_dashboard.jade