tracks galleria
Merge branch 'master' of github.com:jchaney01/tosob

Signed-off-by: Jason Chaney <jason@creativeacceleration.com>

Conflicts:
	app/views/includes/meta-head.blade.php