Exercise 2
Merge branch 'master' of https://github.com/Grashalm/learntoprogram_prototype

Conflicts:
	teacher/app/partials/exercise.html