Form_errors on annotation tool; 20 contigs max
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	contig_retrieval_tool/log.txt
	mainsite/views.py
	mainsite/views.pyc