no conflict please
Merge branch 'master' of https://github.com/catskay/yoga_audio

Conflicts:
	app/config/database.php