init import
Merge branch 'master' of github.com:bearprada/iDrink

Conflicts:
	.gitignore