First commit
Merge branch 'master' of ssh://github.com/darthsimon123/drunken-bear

Conflicts:
	.gitignore