.
Merge branch 'develop' of https://github.com/madewithbrio/musicbozz into develop

Conflicts:
	.gitignore