init
Merge branch 'master' of github.com:awesomepeter/railstut

init