Merge branch 'master' of https://github.com/AFGInteracive/gitHub-exercise-files

Conflicts:
	README.md
Edited