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

Conflicts:
	mainsite/views.py
	mainsite/views.pyc
	metagenomics/urls.py
	metagenomics/urls.pyc
	temp/CM-10/Forward.txt
	temp/CM-10/Reverse.txt