committing something
Merge branch 'master' of https://github.com/andrewparrish/jibeproject
revised logic in view