another local edit
Merge branch 'master' of https://github.com/profpoi/test

Conflicts:
	README.md