got ajax post working
got rid of popup iteration from index view page
resolved conflict
confict merged
added feeds controller, views, routes, view
resolving conflict
trying to resolve conflict and merge
fixed the feed, it works
Merge branch 'master' of https://github.com/tbuchanan/Project-2 into tbuchanan-master
resolved conflict