dont be a douche trebeck
Merge branch 'my-first-pull-request' of https://github.com/donpinkus/juicebox into my-first-pull-request

Conflicts:
	app/views/blocks/index.html.erb