GET /users/:id
fix toJSON
Merge branch 'master' of github.com:minsh/fancypants.user

Conflicts:
	package.json