gittest Fabi pushhtmltest
Merge https://github.com/M03J03/Informatik3_WS1415_Team4