s
using theirs
Merge branch 'master' of http://github.com/shareninja/shareninja
notification basic
Merge branch 'master' of http://github.com/shareninja/shareninja
Cleaned up stylesheet.
workingonnotif
Added infrastructure for sharing with friends/groups.
Merge pull request #23 from ehenriks528/master

Improves Main Menu with folder picture
Connected upload page to menu.
Merge branch 'master' of http://github.com/shareninja/shareninja
notificationspage
removed
Merge pull request #24 from ditkin/master

notificationspage
merge_head
Merge pull request #25 from nh0815/master

Changes to upload page
Fixed JSON issue in client.js.
Added schemas for files and folders.
Merge pull request #26 from nh0815/master

Files/folders schema
Attached upload page to folder links on main page.