working on edit. still not working
Merge branches 'comments' and 'master' of https://github.com/martflu/amanaman into comments
Merge branch 'master' of https://github.com/martflu/amanaman into comments
fixed profile

media root problem nearly fixed
Merge branch 'master' of https://github.com/martflu/amanaman
added custom template tag for rendering uploads;
Merge remote-tracking branch 'origin/master'
added custom template tag for rendering uploads;
fixed gravatar download
Merge branch 'master' of https://github.com/martflu/amanaman into comments
added query_comments_without_responses
challenge image media root fix
Merge branch 'master' of https://github.com/martflu/amanaman
forgot to commit a file
fixed query_comments_without_responses and test added
Merge branches 'comments' and 'master' of https://github.com/martflu/amanaman into comments
evaluation media root fix
Merge branch 'master' of https://github.com/martflu/amanaman
FEED filters are now persistent thanks to a cookie. this rocks
fixing the the previous commit :p