in music software folder
Merge branch 'master' of https://github.com/usrfrndly/TapTapREVOLUTION

Conflicts:
	.idea/workspace.xml
	game/views.py