add and change wiki
changes
Merge branch 'master' of https://github.com/exquisitesilens/wiki

Conflicts:
	index.md