hih
Merge branch 'master' of https://github.com/catskay/yoga_audio

Conflicts:
	app/config/database.php
	app/controllers/HomeController.php
	public/css/welcome.css