took out whitespace
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	models/userModel.js
took out whitespace