Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'dev', remote-tracking branch 'origin/dev'
Craigsliststoof work in progress
Merge branches 'master' and 'dev' into dev