changes
Merge branch 'master' of https://github.com/katrinaezis/Repo1

Conflicts:
	README.md