Updated app/assets/stylesheets/framework_and_overrides.css.scss
Updated app/assets/stylesheets/framework_and_overrides.css.scss
Updated app/assets/stylesheets/framework_and_overrides.css.scss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Updated app/assets/stylesheets/framework_and_overrides.css.scss
Updated app/assets/stylesheets/framework_and_overrides.css.scss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Updated app/assets/stylesheets/framework_and_overrides.css.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/images/Thumbs.db
	app/assets/images/logo.png