test
Merge branch 'sprint1' of https://github.com/jmccranie/Blast.git into
sprint1

Conflicts:
	Blast/testpull.txt