Github herping

Cause I am on my home pc again -.-
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/floyd-fabian/js/app.js
	www/floyd-fabian/js/functies.js
	www/static/js/handlers/exercise.js