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

Conflicts:
	contig_retrieval_tool/primers_2.csv
	log.txt
	mainsite/views.py
	mainsite/views.pyc
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/views.py
	mainsite/views.pyc