correct json messages now
figured out downloading. to-do: uploading
restored the json error for login, solved weird cookie problem
added logo to main
added logo to main
added logo to main
Figured out file uploading. Merge incoming?
some minor fixes
Merge branch 'helen'
Merge pull request #1 from InfinityPenguin/helen

Helen
merging master and helen's branch
gerge branch 'master' of https://github.com/InfinityPenguin/ShareSound
confirmed merge works?
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