User points updated
Merge branch 'master' of https://github.com/karteekpittala/TaskYak

Conflicts:
	config/routes.js