.
pew
Just received a copy of home task slide, it says I should merge my
branches with github pull request.
Merge branch 'master' into gitInConflict

Conflicts:
	README.md

.