Latest Local change
Merge branch 'master' of github.com:JangoBoogaloo/git_spike

Conflicts:
	merge/mergeFile