Modifying SQL3 Gem
Removing Coffee Script
Merge branch 'master' into final-css-p2

Conflicts:
	app/views/layouts/application.html.erb