My Changes
Merge branch 'master' of https://github.com/enialen/foundations-class-july

Conflicts:
	README