housekeeping
Merge branch 'master' of github.com:jpfinlay/6108eng
added Rails app - sojourn