getting data from admin side to user side
Merge branch 'master' of https://github.com/daphnechong/she-hacks

Conflicts:
	views/home.hbs