c
Changed constants and stuff
Merge branch 'master' of https://github.com/ofrendo/Fallstudie
Merge