merge
Merge branch 'master' of https://github.com/gastondisacco/bg

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