init
Merge branch 'master' of github.com:maltine-records/tokyo0505

Conflicts:
	.gitignore