added musicbrainz
Merge branch 'master' of https://github.com/berrberr/trackrank

Conflicts:
	.gitignore
	app/controllers/UsersController.php
	app/routes.php
	app/views/layouts/scaffold.blade.php