reorganised the home#show template to display the global feed content and cleaned up the application layout template
added some links to the global feed filtration
got some output, duplicat and not pretty, but moving forward. When i used the /  @feeds = @user.feed_items / variable it put my computer in a badddd mood.
just dinking around
experimenting with twitter and STI
tiles to user show page done
reversed order content
converted to STI
merging sti changes with wireframes
last setup before master merge
tl_text synced with form
ready to merge master
made small adjustment to model
Merge branch 'twitter'
merged all posting forms to new tl_blah style. wicked
removed old partials
Merge branch 'shanes_branch' of github.com:aimzatron/feed_engine into sti_implementation
merge conflict resolution and link display in show correction
fixed rebase issues
added tests for tl_text