added imgrr
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/layout.blade.php