Init
Merge branch 'master' of https://github.com/alflegler/wiki

Conflicts:
	README.md