Added my name
conflict solved
Merge remote-tracking branch 'upstream/master'
added solution to exercise1
fixed a typos
updated java examples with guiding comments, added lab2 README guide
solution lab2/exercise1
solution lab2/ex2
updated lab2 readme
fixed links
Update README.md
Merge from upstream
Corrected build.xml output jar name of exercise1 lab2
Add solution of exercise 2
Add solution of exercise 3
lab2/Ex3 solution v1
updated version of HealthProfileReader
Merge branch 'master' of https://github.com/cdparra/introsde2013
Lab3 in-progress notes
moved example 1