trauuuush
Merge https://github.com/shmowgli/udacity

Conflicts:
	routes/user.js