Added back symbolic link from /style.css to /stylesheets/style.css
Add in Compass Librarie Files
Remove SASS Cache files from Git Repo
Add .gitignore to ignore SASS Cache fiels
Merge remote-tracking branch 'origin/flexbox-layout' into flexbox-layout

Conflicts:
	.sass-cache/8ac0f675cb555c5f7d30b08ccbaff3fc6150f08f/style.scssc
	sass/addons/_button.scss
	sass/addons/_clearfix.scss
	sass/addons/_directional-values.scss
	sass/addons/_ellipsis.scss
	sass/addons/_font-family.scss
	sass/addons/_hide-text.scss
	sass/addons/_html5-input-types.scss
	sass/addons/_position.scss
	sass/addons/_prefixer.scss
	sass/addons/_retina-image.scss
	sass/addons/_size.scss
	sass/addons/_timing-functions.scss
	sass/addons/_triangle.scss
	sass/addons/_word-wrap.scss
	sass/css3/_animation.scss
	sass/css3/_appearance.scss
	sass/css3/_backface-visibility.scss
	sass/css3/_background-image.scss
	sass/css3/_background.scss
	sass/css3/_border-image.scss
	sass/css3/_border-radius.scss
	sass/css3/_box-sizing.scss
	sass/css3/_calc.scss
	sass/css3/_columns.scss
	sass/css3/_filter.scss
	sass/css3/_flex-box.scss
	sass/css3/_font-face.scss
	sass/css3/_font-feature-settings.scss
	sass/css3/_hidpi-media-query.scss
	sass/css3/_hyphens.scss
	sass/css3/_image-rendering.scss
	sass/css3/_keyframes.scss
	sass/css3/_linear-gradient.scss
	sass/css3/_perspective.scss
	sass/css3/_placeholder.scss
	sass/css3/_radial-gradient.scss
	sass/css3/_transform.scss
	sass/css3/_transition.scss
	sass/css3/_user-select.scss
	sass/functions/_assign.scss
	sass/functions/_color-lightness.scss
	sass/functions/_flex-grid.scss
	sass/functions/_golden-ratio.scss
	sass/functions/_grid-width.scss
	sass/functions/_modular-scale.scss
	sass/functions/_px-to-em.scss
	sass/functions/_px-to-rem.scss
	sass/functions/_strip-units.scss
	sass/functions/_tint-shade.scss
	sass/functions/_transition-property-name.scss
	sass/functions/_unpack.scss
	sass/helpers/_convert-units.scss
	sass/helpers/_gradient-positions-parser.scss
	sass/helpers/_is-num.scss
	sass/helpers/_linear-angle-parser.scss
	sass/helpers/_linear-gradient-parser.scss
	sass/helpers/_linear-positions-parser.scss
	sass/helpers/_linear-side-corner-parser.scss
	sass/helpers/_radial-arg-parser.scss
	sass/helpers/_radial-gradient-parser.scss
	sass/helpers/_radial-positions-parser.scss
	sass/helpers/_render-gradients.scss
	sass/helpers/_shape-size-stripper.scss
	sass/helpers/_str-to-num.scss
	sass/settings/_asset-pipeline.scss
	sass/settings/_prefixer.scss
	sass/settings/_px-to-em.scss
	style.css
Removed Thumbs.db files from Git repo
Added gitignore for .db files
Removed bourbon and bower components from stylesheets folder since these directories should have been (and are in) sass directory.
Changed symbolic link for /style.css to /css/style.css
Removing /style.css to get rid of symbolic linked file.
Changed /style.css file back to copy of /css/style.css so I (Steve) won't screw up John's work.  I have made a local branch with a own symbolic link between /style.css and /css/style.css.  (Hope that makes sense, John)