worksi not^
Merge branch 'master' of https://github.com/fhtw/leitner_ecker

Conflicts:
	index.htm