working
Merge branch 'staging' of github.com:noahprince22/generic_rails into build
you better seethis