sdasdsdasds
Merge branch 'design' of https://github.com/HTWK-App/Smartphone-App.git into design
sadasdsadd