testing
Merge branch 'master' of https://github.com/klgrimley/I211

Conflicts:
	application/database.class.php
	models/music.class.php