Merge branch 'master' of https://github.com/galleon1/chocolate-milk.git