testing
Merge branch 'master' of https://github.com/mmcdon20/MusicApp

Conflicts:
	controllers/default.py