adding tooltips and jquery-ui assets
Merge branch 'master' of https://github.com/coronellw/lco

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/sessions/new.html.erb
	app/views/static_pages/about.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/routes.rb

	modified:   app/assets/stylesheets/custom.css.scss
t
#