update
updates
Merge branch 'master' of https://github.com/kmcnally26/Wiki
udpates
Conflicts:
	.gitignore