Merge pull request #2 from shipfam/dev

Dev
Merge pull request #3 from shipfam/dev

minor updates to configuration
Chris's edits to make it work
Merge branch 'dev'
Merge branch 'master' of https://github.com/shipfam/boatsnap
merging

or trying to
Merge branch 'master' into dev
Merge branch 'dev'
Added Chris's name to the bottom
Merge pull request #8 from shipfam/master

updating dev to master