config app.php
Merge branch 'master' of https://github.com/vnmedia/onimusicBack

Conflicts:
	app/config/app.php
	public/index.php