added migrations
Readded auth buttons
Merge branch 'master' of https://github.com/freshly-news-official/freshly-news
populated news accordingly
started working on controller preferences
started preferences for fresh_controller and messed it up by pulling
Added tag_image and preferences migrations
added user preferences to controller
Merge branch 'master' of https://github.com/freshly-news-official/freshly-news
new app.js
new app.js
user preferences is now enabled. Bask in the glory of the almighty Code!
Merge branch 'master' of https://github.com/freshly-news-official/freshly-news
solving stuff
For Roxi
For Roxi 2
mergeMerge branch 'master' of github.com:freshly-news-official/freshly-news
Merge branch 'master' of github.com:freshly-news-official/freshly-news

Conflicts:
	app/views/fresh/index.html.erb
trying to merge