Search and Home Page
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp4.sc2.Search_Page
Display the 'My Resources' link when signed in only
Improve the design of the home page
Add a 'custom-variables' Sass file to customize Bootstrap
Update the 'bootstrap-sass' gem to 3.0.0.0rc
Organize the scss files
Improve the design of the sign-in and sign-up forms
Improve the design of the sign-in and sign-up forms
Add a background image to the homepage
Merge branch 'sp4.demo' of github.com:projectcs13/sensor-cloud-website into sp4.sc1.autocompletion

Conflicts:
	app/controllers/resources_controller.rb
	config/routes.rb