css
fixed styling in styles.css.scss
fixed merge conflict

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

Conflicts:
	app/views/words/show.html.erb