making sure this works
Merge branch 'master' of https://github.com/cfries3/361
setup