update wiki
Merge pull request #4 from ShowJoy/master

update wiki