Initial commit
Merge branch 'master' of github.com:TristanJones/Wiki

Conflicts:
	.gitignore