Semi-Working Annotation Pipeline
1.1 Working annotation tool
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	contig_retrieval_tool/log.txt
Merge branch 'master' of https://github.com/itskathylam/metagenomics

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

Conflicts:
	mainsite/templates/tool_annotation.html
	mainsite/views.py
	mainsite/views.pyc
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	contig_retrieval_tool/log.txt
	contig_retrieval_tool/temp/tmp/BT2/Forward.txt
	contig_retrieval_tool/temp/tmp/BT2/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-15/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-15/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-19/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-19/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/CM-92/Forward.txt
	contig_retrieval_tool/temp/tmp/CM-92/Reverse.txt
	contig_retrieval_tool/temp/tmp/lac36W/Forward.txt
	contig_retrieval_tool/temp/tmp/lac36W/Reverse.txt
	contig_retrieval_tool/tmp/out/retrieval.csv
	mainsite/views.py
	mainsite/views.pyc
update
Updated tools for nina <3
cant remember
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/views.py
tool fix
Merge branch 'master' of https://github.com/itskathylam/metagenomics
commenting
more comments
contig tool match colours css
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/views.pyc
css update
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/views.pyc
fixed tool submit template