test
Merge branch 'master' of https://github.com/fh-koeln/wba1-2012
Merge branch 'master' of https://github.com/fh-koeln/wba1-2012