Merge branch 'dev'
some changes to the controller arent tracked but I havent changed the controller. Curious.
working subscribtion
added the most recent bookmarks to the menu and changed views to show title and not id"
updated subscription changes
just finished dynamic menu
finished working on the feeds show page, I should probably switch branch!
Merge branch 'bookmark_and_favourites' into dev
Merge branch 'dev' of github.com:lambro/Project2RSS into dev
Merge branch 'dev'
Merge branch 'dev' of github.com:lambro/Project2RSS into subs
Merge branch 'dev'
HOTFIX : removed file in controllers
removed development.rb
fixing errors
new email
Merge branch 'master' of github.com:lambro/Project2RSS
no letter
new changes bookmark
heroku bookmarks