Merge pull request #16 from cpaika/master

Bug Fix: Group Meeting
s
using theirs
Made dummy main page
Dummy Main Page
Merge pull request #17 from ehenriks528/master

here's a title
Drop down box fixed

Supported for Chrome and Safari
section doesn't work for firefox
Merge branch 'master' of https://github.com/mayukudo/shareninja into mayu-master

Conflicts:
	public/javascripts/client.js
	public/stylesheets/style.css
	routes/file/index.js
	routes/userSearch/index.js
	views/file/download.ejs
	views/file/upload.ejs
	views/topics/index.ejs
Merge pull request #19 from nh0815/master

Merge
Fixed artifact of merge.
add fileFolder
Merge pull request #20 from nh0815/master

Fixed artifact of merge.
Merge branch 'master' of http://github.com/shareninja/shareninja
notification basic
new Main page
new Main Page
Fixed merge issue in stylesheet.
Merge pull request #22 from nh0815/master

Fixed merge issue in stylesheet.
Merge branch 'master' of http://github.com/shareninja/shareninja
Cleaned up stylesheet.