export truely fixed
testing contig tool
contig tool prior to primer pair addition to primer table
Contig  Tool prior to primer pair addition to primer table

Conflicts:
	mainsite/views.py
	mainsite/views.pyc
	metagenomics/urls.pyc
additional export changes
pulling html page changes

Conflicts:
	mainsite/templates/contig_all.html
	mainsite/templates/cosmid_assay_all.html
	mainsite/templates/cosmid_end_tag_all.html
	mainsite/templates/subclone_all.html
	mainsite/templates/subclone_assay_all.html
trying to merge

Conflicts:
	mainsite/templates/subclone_assay_all.html
Nina's push
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/forms.py
	mainsite/models.py
	mainsite/templates/contig.html
	mainsite/templates/contig_all.html
	mainsite/templates/cosmid_assay_all.html
	mainsite/templates/cosmid_end_tag_all.html
	mainsite/templates/orf_all.html
	mainsite/templates/orf_contig_all.html
	mainsite/views.py
	metagenomics/urls.py