lalalalalalalalala....
es hat sich was geändert

Signed-off-by: Florian Schober <f.schober@live.com>
Merge branch 'master' of https://github.com/Imasius/foop-ex1
Merge branch 'master' of https://github.com/Imasius/foop-ex1