Initial files
Static pages controller
routes.rb changed
resolving conflitcts