Test commit 2, from a new directory.
Merge branch 'master' of https://github.com/ahrekar/bacon-install

Conflicts:
	devDb.h2.db