base
Merge branch 'master' of https://github.com/ramanjar/jsound

Conflicts:
	app/views/layouts/base.blade.php