git ignore
Merge branch 'master' of https://github.com/asgpng/song-database

Conflicts:
	.gitignore