this version works
merge
merge
merge
merge
merge
merge
merge
merge
Merge branch 'staging' of github.com:noahprince22/generic_rails into build