heroku prep
Merge branch 'master' of github.com:rbtkoz/octocycle