First commit
Merge branch 'master' of https://github.com/madstro/ridge_redesign