.gitignore
Merge branch 'master' of https://github.com/peterchylewski/MegaPlayer

Conflicts:
	.DS_Store