First run of annotation -annotate tool
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	annotation_tool/Test.txt
	annotation_tool/data.lib
	annotation_tool/log.txt
	annotation_tool/mg_temp.tar
	annotation_tool/orf_pred_out.txt
	annotation_tool/out.txt
	annotation_tool/temp/predicts/query.sh
	mainsite/views.py
	mainsite/views.pyc