added a draft code of conduct
Merge branch 'master' of github.com:railsbridge-montreal/railsbridge-montreal-website
Merge branch 'master' of github.com:railsbridge-montreal/railsbridge-montreal-website
Merge branch 'master' of github.com:railsbridge-montreal/railsbridge-montreal-website

Conflicts:
	app/controllers/pages_controller.rb
	config/routes.rb