adding benchmark action
Merge branch 'origin/master'

Conflicts:
	config/routes.rb