Merge pull request #1 from JanHorak/stable

Initial Project Commit
Aufgabe1_2.1.2