errors
Merge branch 'master' of https://github.com/Catpaw42/Area51.git

Conflicts:
	51_del2/src/spil/Decorator.java
	51_del2/src/test/MainDecoratorTest.java