table OR instead of ||
Merge branch 'master' of https://github.com/janniks/uibk

Conflicts:
	SS14/Programmiermethodik/pm1.md