update
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	mainsite/static/tempdisplay/pool1_scaffold42_1predicted.png
	mainsite/templates/cosmid_detail.html
	mainsite/views.py
	mainsite/views.pyc