adding a is24 picture slide
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
adding a is24 picture slide nd some of marcels stuff