-
fixed merge
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14
added doxygen to Parser.h
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14