some progress
Merge branch 'master' of github.com:Krassmus/SuperWiki