Miguel's sprint #2 changes
Merge branch 'master' of https://github.com/bigbeta1914/SSW555WS_2014_Team5

Conflicts:
	src/java/ssw555/project/team5/GEDCOMFileReader.java