eliminating the unique pieces so we can eventually refactor into a single branch
Merge branch 'develop'
Merge branch 'master' of github.com:web2project/web2project