merge
Merge branch 'master' of https://bitbucket.org/tchara/exercise-tool

Solve Conflicts:
	app/controllers/exercises_controller.rb
	app/controllers/users_controller.rb
	app/views/exercises/show.html.erb
	config/routes.rb
small change
add filter for exercises (better way)