revert
Merge branch 'master' of https://github.com/OzTK/drink-it

Conflicts:
	meteor-boilerplate.bat
	test.bat