1.a) fertig, 1.b) start
1.b) in progress
test
Merge branch 'master' of https://github.com/SimonGadgeteer/PROG1

Conflicts:
	.gitignore