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

Conflicts:
	server/routes/clips.js
Merge branch 'master' of github.com:Clipsy/clipsy

Conflicts:
	server/routes/clips.js
	server/routes/users.js