Step 8: remind user to save changes
Merge branch 'master' into awesome

Conflicts:
	README.md
Step 3: remind user to save changes