Created Users on Bootstrap and starred Hannah
Merge branch 'master' of github.com:PIWEEK/hythloday

Conflicts:
	hythloday-front/app/scripts/services/user.js