merge conflict from two
Merge branch 'master' of github.com:mf-xea/PracticeRepo

Conflicts:
	README.md
fixed merge conflict