Added my name
conflict solved
Merge remote-tracking branch 'upstream/master'
added solution to exercise1
fixed a typos
Merge from upstream
Corrected build.xml output jar name of exercise1 lab2
Add solution of exercise 2
Add solution of exercise 3
Merge remote-tracking branch 'upstream/master'
Code refactoring
Updated exercise 3. Now set also the value and can add person.
Merge remote-tracking branch 'upstream/master'
Fixed spaces
Fixed build.xml
Added solutions to exercise 1
Added solution to exercise 2 lab 3
Merge remote-tracking branch 'upstream/master'
initial material for Lab4
updated lab4 guide and examples