getclips
Merge branch 'master' of github.com:Clipsy/clipsy

Conflicts:
	server/routes/user.js