optimization
README.md edited online with Bitbucket
meeting on monday - a lot of changes - see bitbucket
Merge branch 'master' of https://bitbucket.org/tchara/exercise-tool

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