Changed README (correct)
Merge branch 'master' into production

Conflicts:
	README.md

Deleted gedit ~ file