Add Alexander Kriegisch's message
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/kriegaex/training-portal

Conflicts:
	README.md