added pony to gemfile, made slight changes in tasks controller
Merge branch 'master' into adam