new file:   SW3/people.txt
	new file:   SW3/src/labs_one/Collection.java
	new file:   SW3/src/labs_one/One.java
	new file:   SW3/src/labs_one/People.java
	new file:   SW3/src/labs_one/Person.java
	new file:   Zuul
Merge branch 'master' of https://github.com/muster/workspace