Emily made some changes
Merge branch 'master' of github.com:Barteezy/pull-request-practice into emily_makes_changes

Conflicts:
	README.md
Merge pull request #1 from craftninja/emily_makes_changes

Emily makes changes