rakeupdate
glitch effect was decided against, so removed. fixed header as before and starting bookmarking functionality
tidied up the feeds page and added favourite and bookmark buttons
Merge branch 'dev'
a few little changes
some changes to the controller arent tracked but I havent changed the controller. Curious.
Merge branch 'master' of github.com:lambro/Project2RSS into dev
test
Merge branch 'dev' of github.com:lambro/Project2RSS into dev
added the most recent bookmarks to the menu and changed views to show title and not id"
just finished dynamic menu
finished working on the feeds show page, I should probably switch branch!
Merge branch 'bookmark_and_favourites' into dev
email authorisation
Merge branch 'dev' of github.com:lambro/Project2RSS into dev
Merge branch 'dev'