removed letsrate
fixed merge issues
Merge branch 'master' of github.com:jweaver60/juicevault