Added pages to the site
Merge branch 'master' of github.com:evanwieren/OMR-4.0.0

Conflicts:
	app/controllers/pages_controller.rb
	app/views/pages/home.html.erb
	config/routes.rb
Dont look at my rubymine files