DON'T MERGE THIS!
Merge branch 'master' of github.com:theodi/hot-drinks
Anal formatting change

Really only to test odibot's pull request alerts
Merge branch 'refs/heads/master' into anal-formatting-change

Conflicts:
	README.md
Revert "DON'T MERGE THIS!"

This reverts commit a467d727a67475dced4a53ecee8707990e3097cd.
Merge pull request #11 from theodi/anal-formatting-change

Anal formatting change