Merge conflict - edited on the laptop.
Merge branch 'master' of https://github.com/jfarrell468/homework1-demo

Conflicts:
	README