tekstendringer
Merge branch 'master' of https://github.com/javaBin/submitit-redux

Conflicts:
	resources/public/index.html