added bootstarp, added custom.css.scss, made changes to layout and home.html.erb
Styling added... WOOT
Rspec test rewritten, CSS added
Finished layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css.scss

 Changes to be committed:

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/bootstrap.js.coffee
	new file:   app/assets/javascripts/users.js.coffee
	modified:   app/assets/stylesheets/custom.css.scss
	new file:   app/assets/stylesheets/users.css.scss
	new file:   app/controllers/users_controller.rb
	new file:   app/helpers/users_helper.rb
	new file:   app/views/layouts/_footer.html.erb
	new file:   app/views/layouts/_header.html.erb
	new file:   app/views/layouts/_shim.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/static_pages/about.html.erb
	modified:   app/views/static_pages/contact.html.erb
	modified:   app/views/static_pages/home.html.erb
	new file:   app/views/users/new.html.erb
	new file:   bin/compass
	new file:   bin/lessc
	modified:   config/application.rb
	new file:   config/locales/en.bootstrap.yml
	modified:   config/routes.rb
	deleted:    public/index.html
	new file:   spec/controllers/users_controller_spec.rb
	new file:   spec/helpers/users_helper_spec.rb
	modified:   spec/requests/static_pages_spec.rb
	new file:   spec/requests/user_pages_spec.rb
	new file:   spec/support/utillities.rb
	new file:   spec/views/users/new.html.erb_spec.rb