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

Conflicts:
	mainsite/__init__.pyc
	mainsite/admin.pyc
	mainsite/models.pyc
	mainsite/views.pyc
	metagenomics/__init__.pyc
	metagenomics/settings.pyc
	metagenomics/urls.pyc
	metagenomics/wsgi.pyc