Merge pull request #31 from chluehr/master

fixed layout
added martin and me, removed ramzi
added my slides to the slides page