discard
Merge branch 'master' of https://github.com/CharlesHolbrow/MeToo

Conflicts:
	public/userDashboard.html
refactor