first commit
Merge branch 'master' of github.com:yogun/bunko

Conflicts:
	.gitignore