README.md
Dummy home, dummy profile setting

Problem: change old pass to new is not working
Merge pull request #7 from mayukudo/master

Dummy home, dummy profile setting
Added basic support for uploads and downloads. Need backend library for putting/retrieving files from permanent store.
Merge branch 'master' of https://github.com/shareninja/shareninja

Conflicts:
	app.js
Fixed merge issue in app.js
Merge pull request #9 from nh0815/master

Basic upload/download support
Merge http://github.com/shareninja/shareninja
Small chages setting up routing for User Search page
Merge pull request #10 from cpaika/master

Small changes
origin
Merge pull request #11 from cpaika/master

Bug fix
Adding in friend Schema
Merge pull request #12 from cpaika/master

Adding in friend logic
app socket
Merge branch 'master' of http://github.com/shareninja/shareninja
clientsidesocket
app
Update README.md
Bug fix with user creation