nina i hate you
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/temp/tmp/BF4a/Forward.txt
	contig_retrieval_tool/temp/tmp/BF4a/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-10/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-10/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-130/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-130/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-18/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-18/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-2/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-2/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-64/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-64/Reverse.txt
	contig_retrieval_tool/temp/tmp/CM-69/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-69/Reverse.txt
	contig_retrieval_tool/temp/tmp/PO3/Forward.txt
	contig_retrieval_tool/temp/tmp/PO3/Reverse.txt
	mainsite/static/tempdisplay/pool1_scaffold248_1genbank.png
	mainsite/static/tempdisplay/pool1_scaffold248_1predicted.png
	mainsite/views.pyc