Add rails_12factor gem
add heroku
resolved syntax error
adding heroku
Merge branch 'master' of github.com:tedwardmah/news-bubble
changed css
Merge branch 'master' of github.com:tedwardmah/news-bubble into fixing-articles-page
Merge branch 'master' of github.com:tedwardmah/news-bubble into fixing-articles-page
Merge branch 'master' of github.com:tedwardmah/news-bubble into fixing-articles-page
changing font in the css file
Merge branch 'master' of github.com:tedwardmah/news-bubble
Merge branch 'fixing-articles-page'
Merge branch 'master' of github.com:tedwardmah/news-bubble
changed the scripts.js
added toggle to index.html.erb
fix merge conflict

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

Conflicts:
	app/assets/javascripts/scripts.js
	app/views/words/show.html.erb