Changes to main page
Merge branch 'master' of https://github.com/Shounin/WikiApp.git
Merge branch 'master' of https://github.com/Shounin/WikiApp.git
finished mergin
Merge branch 'master' of https://github.com/Shounin/WikiApp.git