Changed contact number
Merge branch 'master' of https://github.com/austinneely/petulant-octo-batman

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/application.sass
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	app/views/pages/about.html.erb
	app/views/pages/contact.html.erb
	app/views/pages/services.html.erb
	config/application.rb
	config/database.yml
	config/environments/production.rb
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml