Add iced title
Merge branch 'master' into ice-water

Conflicts:
	bottled.water.txt "Title changes had problems"
Merge pull request #21 from githubschool/ice-water

Add iced title