updates
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	contig_retrieval_tool/primers_1.csv
	contig_retrieval_tool/primers_2.csv
	contig_retrieval_tool/temp/tmp/PO3/Forward.txt
	contig_retrieval_tool/temp/tmp/PO3/Reverse.txt
	mainsite/views.pyc