Merge branch 'gh-pages' into web-basics
Merge branch 'web-basics' of https://github.com/fh-koeln/wba1-2013 into web-basics