Merge branch 'master' of https://github.com/githubschool/recipes-for-06-18 into liquers
Changed read me
Merge remote-tracking branch 'origin/master' into liquers

Conflicts:
	README.md
Merge pull request #49 from githubschool/liquers

Liquers