cleaned up app html
cleaned up app html
set up for js done, falls over on ajax call
adding of category to the subscription side menu works
Working sidebar fill correctly
fixed broken direct from menu bar to show page of subscriptions
taken off feeds table at bottom of feeds index
corrected differences in local and remote development branch
updated with dev and merged with local changes, conflict resolved