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
pictures work with ImageMagick
form jquer legit
uploading pictures working
link_to works for submitted links
changed regexp for http not required
added the soundcloud widget thang
words wrap inside divs
precompiled assets
removed tweets_worker
removed soundcloud js
Merge branch 'lastfm' into experimental_meeting_branch
soundcloud player plays genres
soundcloud player works
merging conflicts
cleared outdated assets
pushing up to github