fixed merge problem in Makefile wq Merge branch 'master' of ssh://git.kbase.us/dev_container
fixed merge problem in Makefile
wq
Merge branch 'master' of ssh://git.kbase.us/dev_container

Conflicts:
	Makefile

olsonanl/dev_container_kb,kbase/dev_container,kbase/dev_container,SEEDtk/seedtk,SEEDtk/seedtk,PATRIC3/dev_container,PATRIC3/dev_container,olsonanl/dev_container_kb