user settings and password
Merge branch 'master' of https://github.com/itskathylam/metagenomics

Conflicts:
	blast_db.db.nin
	blast_query.fa
	blast_results.xml