modified Rakefile
made change to config/application.rb
Merge branch 'static-pages'