Init
Merge branch 'master' of github.com:dclelland/rails-sample-app