Added wiki content
Wiki content
Merge branch 'feature/wiki' into develop
Merge pull request #11 from pudly/develop

yay wiki information