- Added logic for US015 & US016.
- Created new acceptance test file: acceptanceTestFile_Miguel.txt to check US04 & US05.
Merge branch 'master' of https://github.com/bigbeta1914/SSW555WS_2014_Team5

Conflicts:
	src/java/ssw555/project/team5/GEDCOMFileReader.java
Deleted this test
test2