Merge branch 'master' of https://github.com/mwmarzin/DrinkChewGuru

Conflicts:
	.gitignore