Merge branch 'master' of github.com:brianspinos777/kipu_test1
Merge branch 'master' of heroku.com:fierce-river-2499