init
Merge branch 'master' of github.com:metacortex/scaffold_rails