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

Conflicts:
	annotation_tool/log.txt
	mainsite/views.pyc