server side validation done except for regex
added server side regex validation
kinmens backup
adding tests
Merge branch 'helen' of github.com:InfinityPenguin/ShareSound into kinmen

Conflicts:
	server/api/user/index.js
	server/api/user/user.model.js
	server/api/user/user.model.spec.js
merging with test
some wavesurfer
Merge branch 'master' into kinmen
added controls
wavesurfer showhide
wavesurfing