fixed rebase issues
Merge branch 'tweet' of github.com:aimzatron/feed_engine into background_workers
Merge branch 'master' of github.com:aimzatron/feed_engine into background_workers
fixed merge conflicts
added lastfm omniauth
pictures work with ImageMagick
adding ability to create lastfm tokens for users
form jquer legit
uploading pictures working
link_to works for submitted links
changed regexp for http not required
added the soundcloud widget thang
added lastfm top tracks for users
deleted sneaky file
words wrap inside divs
precompiled assets
removed tweets_worker
removed soundcloud js
Merge branch 'lastfm' into experimental_meeting_branch
merging conflicts