visual studio
msg
Merge branch 'develop' of https://github.com/tidileboss/juketube into develop

Conflicts:
	.gitignore