first commit
Merge branch 'master' of github.com:lion-man/tutorial-rails