Presentation and fixed server.rb
Merge branch 'master' of https://github.com/Panum/sw701e12