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

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