learning about git branches
Merge branch 'master' of https://github.com/mc-Corkell/voiceOfGod

Conflicts:
	todo