Removed default Rails page
Not through with the layout and routes
Finished Layout and routes
Merge branch 'filling-in-layout'

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/users_controller.rb
	app/helpers/.application_helper.rb.swp
	app/helpers/users_helper.rb
	app/models/.user.rb.swp
	app/views/layouts/.application.html.erb.swp
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/_stylesheets.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/.help.html.erb.swp
	app/views/users/.show.html.erb.swp
	config/routes.rb
	spec/controllers/users_controller_spec.rb
	spec/requests/layout_links_spec.rb
	vendor/assets/stylesheets/custom.css
Updated User model with password & user show page
Add assets pipeline