fixing feed format
fixed merge conflict
playing with styles
dropped several files
fixed conflicts
fixed conflicts