test
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	presentation/presentation_elias.pdf
reverted bad changes.