merged branch bootstrap into master
Merge branch 'master' of github.com:dummhupe/bowlingdb