Adams CSS Cleanup
CSS Changes
merge master into working copy
merge master into working copy
resolve conflict
Merge branch 'master' of github.com:linesarefuzzy/cofunder; resolve conflicts

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bootstrap-responsive.css
	app/views/loans/show.html.erb