Merge branch 'master' of https://github.com/githubschool/recipes-for-06-18 into liquers
Add icy version
changes by sara
Edited README.md to instigate conflict
Added instructions
Changed read me
sara update to readme
README
Merge branch 'readmeEdits'

Attempted to resolve merge conflict.

Conflicts:
	README.md
added change by sara
Merge remote-tracking branch 'origin/master' into liquers

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master' into readme-pizza

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

Liquers
Merge pull request #44 from githubschool/readme-pizza

Added instructions
added change by sara
Merge pull request #32 from githubschool/changes

changes by sara
Merge remote-tracking branch 'origin/master' into mojito
Merge branch 'master' of https://github.com/githubschool/recipes-for-06-18
Merge remote-tracking branch 'origin/mytest'

Conflicts:
	README.md
Merge remote-tracking branch 'school/master'