csv files fixed
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	contig_retrieval_tool/log.txt
	contig_retrieval_tool/primers_1.csv
	contig_retrieval_tool/primers_2.csv
	contig_retrieval_tool/test2.txt
	mainsite/views.py
	mainsite/views.pyc
	metagenomics/urls.pyc