first commit
Merge branch 'master' of https://github.com/panser/wiki

my first merge