updates
Merge branch 'master' of github.com:trappist/rewardrocket
Merge branch 'master' of github.com:trappist/rewardrocket