Added the merge warning
Merge branch 'master' of https://github.com/spencehood/Lab_03

Conflicts:
	README