Added a Pages controller
Done with Static pages
Added a pages
Merge branch 'static-pages'

Conflicts:
	app/controllers/pages_controller.rb
	app/controllers/pages_controller.rb~
	app/views/pages/about.html.erb
	app/views/pages/contact.html.erb
	app/views/pages/home.html.erb
	app/views/pages/home.html.erb~
	config/routes.rb
	spec/controllers/pages_controller_spec.rb