changed markdown file
Merge branch 'master' of https://github.com/rachelleffel/practice

Conflicts:
	practicemarkdown.md

git commit -m "message"