modified:   Large and Open Source Project/build.xml
	modified:   Large and Open Source Project/src/LnOS.java
	modified:   Large and Open Source Project/src/hiv.zip
Merge branch 'master' of https://github.com/tp6m4xup6/group_3

Conflicts:
	Large and Open Source Project/build.xml

	deleted:    Large and Open Source Project/CSV/hiv.zip
	modified:   Large and Open Source Project/build.xml
	new file:   Large and Open Source Project/reports/TESTS-TestSuites.xml
	new file:   Large and Open Source Project/reports/html/0_DataCSVTest.html
	new file:   Large and Open Source Project/reports/html/1_FileDownloadTest-err.html
	new file:   Large and Open Source Project/reports/html/1_FileDownloadTest-out.html
	new file:   Large and Open Source Project/reports/html/1_FileDownloadTest.html
	new file:   Large and Open Source Project/reports/html/all-tests.html
	new file:   Large and Open Source Project/reports/html/allclasses-frame.html
	new file:   Large and Open Source Project/reports/html/alltests-errors.html
	new file:   Large and Open Source Project/reports/html/alltests-fails.html
	new file:   Large and Open Source Project/reports/html/alltests-skipped.html
	new file:   Large and Open Source Project/reports/html/index.html
	new file:   Large and Open Source Project/reports/html/overview-frame.html
	new file:   Large and Open Source Project/reports/html/overview-summary.html
	new file:   Large and Open Source Project/reports/html/package-frame.html
	new file:   Large and Open Source Project/reports/html/package-summary.html
	new file:   Large and Open Source Project/reports/html/stylesheet.css
	new file:   Large and Open Source Project/reports/raw/TEST-DataCSVTest.xml
	new file:   Large and Open Source Project/reports/raw/TEST-FileDownloadTest.xml
	modified:   Large and Open Source Project/src/DataCSVTest.java
	modified:   Large and Open Source Project/src/LnOS.java
	new file:   Large and Open Source Project/src/PatternDownload.java
	deleted:    Large and Open Source Project/src/hiv.csv
	new file:   Large and Open Source Project/test.txt
	new file:   Patterns.txt