Initial commit
Merge branch 'master' of github.com:asparaguscat/Badger

Conflicts:
	.gitignore