parser #2
Merge branch 'master' of https://github.com/M03J03/Informatik3_WS1415_Team4