updated gemfile with mail catcher
updated the readme
updated js view
Merge branch 'master' of github.com:krebates/markibles_2