.gitignore
Merge branch 'master' of https://github.com/guillaume-v/musicNow

Conflicts:
	.gitignore