local commit with scratch2
Merge branch 'master' of https://github.com/JahgDaglet/TestRepo

Conflicts:
	scratch2
c4