Add bootstrap and some static pages
Merge branch 'master' of https://github.com/iyork28/ianyork_us

Conflicts:
	app/assets/stylesheets/static_pages.css.scss
	app/controllers/static_pages_controller.rb
	app/views/static_pages/welcome.html.erb
	config/routes.rb
	test/controllers/static_pages_controller_test.rb