s
using theirs
Merge pull request #19 from nh0815/master

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
Merge pull request #22 from nh0815/master

Fixed merge issue in stylesheet.
Merge branch 'master' of http://github.com/shareninja/shareninja
workingonnotif
improved Main Menu
Merge pull request #23 from ehenriks528/master

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

notificationspage
merge_head