second commit
Merge github.com:8bitreligion/rails-hw_1