forms on contig retrieval joined back together
recombined contig tool forms into one form
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/views.py
	mainsite/views.pyc