fixing fixes
Merge branch 'master' of github.com:tedwardmah/news-bubble

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