some mysql/jdbc config
fixed merge conflict
Merge branch 'master' of https://github.com/jmaxfield21/ScubaSteveMath
merge
Merge branch 'master' of https://github.com/jmaxfield21/ScubaSteveMath
merge
Got string-based database tool working