Heroku Setting
Heroku Setting
Merge branch 'master' of heroku.com:progressy
Merge branch 'master' of https://github.com/Ravenstine/progressy
Merge branch 'master' of https://github.com/Ravenstine/progressy
Resource Partial
fixed merge issues
Merge remote-tracking branch 'origin/resource_partial' into css-fix
fixed ajax for feature