trap
Merge branch 'master' of github.com:TUM-FAF/FAF-121-Alexa-Cristina

Conflicts:
	README.md
Merge branch 'master' of github.com:TUM-FAF/FAF-121-Alexa-Cristina
Commitment of Lab#1 IDE