merge changes
Merge conflict sorting
changed id on submit new feed form
passing in form data to create action on feeds controller
Retreiving feed and posts for creating new feed in JSON
Adding new feed and new feed posts to index page via JSON
dynamically adding new feed to sidebar, posts to main page
Playing around with pub_dates
Changed pub_date to datetime
updated schema
Merge branch 'master' into user_adds_feed
properly displaying and sorting post pub_dates
Added unless statement to prevent against adding the same feed for a user
Changed unless to an if statement, added messages for success and failure of creating new feed
Showing message under add feed form when submitting a feed
Fixed js error caused by no posts data being returned on trying to add duplicate feed
Added error messages for blank form, invalid RSS feed
Corrected error of no posts returning for valid RSS in feeds controller
Merge branch 'master' of github.com:emreiser/loopd
Resolved merge conflicts