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
deleted non-used files, new guide, updated exercise
Merge remote-tracking branch 'upstream/master'
Code refactoring
added people.xml
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 lab1 resources
lab1/README.md guiding notes updated