Cmon git
Merge https://github.com/devonmeyer/TuneSnap

Conflicts:
	.idea/TuneSnap.iml
	.idea/vcs.xml
	.idea/workspace.xml