init
Merge branch 'master' of github.com:Uepsilon/drunken-bartender

Conflicts:
	.gitignore