- remove specific version of rspec-rails to make it more compatible on Windows

Conflicts:
	Gemfile.lock
- use compass-rails instead of compass gem alone
- update ignore list
- add foundation + js files
- add compass config file
- update sass code to follow compass+foundation sass template
- update global css/js includes
- include jQuery or Zepto depending on the browser modernity level
- include foundation manually
- remove unused file
- add comments
- use clearfix for the nav_list
- re-organise sass folder structure
- styling the site layout more
-- add offscreen mixin
Adding default titles to the views.  Definately room for improvement to titles

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' into setup_compass

* master:
  - move sass files into the sass folder - remove app.css and normalize.css since they are generated
  - remove unused call to foundation.js
  Adding default titles to the views.  Definately room for improvement to titles
  - remove specific version of rspec-rails to make it more compatible on   Windows 	app/old_assets/
  - introduce compass + foundation

Conflicts:
	.gitignore
	Gemfile.lock
	app/assets/sass/_settings.scss
	app/assets/sass/common.scss
	app/assets/sass/site_nav.scss
	app/assets/stylesheets/application.scss
	app/assets/stylesheets/conf/_settings.css.scss
	app/assets/stylesheets/foundation_and_overrides.scss
	app/assets/stylesheets/site_nav.scss
	app/assets/stylesheets/widgets/site_nav.scss
	app/views/layouts/application.html.erb
- isolate css class scopes into their own widgets
- make new styles for the site footer
- finalised some basic layout styles
-- added colours config file
-- added subtleText mixin
- rename file
- create button style customisations
- use new button styles
Merge branch 'setup_compass'

* setup_compass:
  - use new button styles
  - create button style customisations
  - rename file
  - finalised some basic layout styles -- added colours config file -- added subtleText mixin
  - isolate css class scopes into their own widgets - make new styles for the site footer
  Adding default titles to the views.  Definately room for improvement to titles
  - styling the site layout more -- add offscreen mixin
  - re-organise sass folder structure
  - use clearfix for the nav_list
  - add comments
  - remove unused file
  - include jQuery or Zepto depending on the browser modernity level - include foundation manually
  - update global css/js includes
  - add foundation + js files - add compass config file - update sass code to follow compass+foundation sass template
  - update ignore list
  - use compass-rails instead of compass gem alone
  - remove specific version of rspec-rails to make it more compatible on Windows
- indent