Initial commit
Merge branch 'master' of github.com:george1minus1/badger

Conflicts:
	.gitignore