fd

Conflicts:
	app/views/blocks/_b_results.html.erb
f
Merge branch 'master' of https://github.com/Dragsbaek/theBlock