Merge master into IDnaSequence
Merge master into IDnaSequence
Bad netbeans...
Merge branch 'SearchEngine'

Conflicts:
	MotifFinder/nbproject/private/private.xml
Merge branch 'IDnaSequence'
Merged Conflicts. Finished constructor with Erics help

Conflicts:
	MotifFinder/RandomizedSearchEngine.h

Conflicts:
	MotifFinder/RandomizedSearchEngine.h
	MotifFinder/nbproject/private/private.xml
Merged and took care of conflicts

Conflicts:
	MotifFinder/nbproject/private/private.xml
"Finished" lociToMotif and RandomizedSearchEngine appears to be done. Beginning testing