Added lamp from week1
Merge branch 'master' of https://github.com/owah/Softwaresystemen

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/owah/Softwaresystemen

Conflicts:
	.classpath
	.gitignore
	src/ss/week2/Rectangle.java
	src/ss/week2/RectangleTest.java