moving towards rails-flavored ruby
Merge branches 'master' and 'static-pages'