last commit!
Merge branch 'master' of https://github.com/yohav/2Help

Conflicts:
	css/app.css
	partials/profile.html