Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4
fix url in css
final precompile???
Revert "final precompile???"

This reverts commit 4df273bb819394e4c737ba7eca5aee615bd0e1e3.
Revert "Revert "final precompile???""

This reverts commit 75801b7d214570d1b1097c4b5e323f5845eed65e.
rerereprecompile
Merge branch 'master' into final-design

Conflicts:
	app/assets/stylesheets/application.css.scss