Title change "better water"
Merge pull request #20 from githubschool/better-water

Title change "better water"
Merge branch 'master' into ice-water

Conflicts:
	bottled.water.txt "Title changes had problems"