test that samson can commit and push
Merge branch 'master' of github.com:mseltzer/slc-conference