append gitignore with tmp and log
fix untracked files
try to fix f***** heroku
attempt to fix heroku
update Gemfile to explicitly state Rails 3.2.14 and include activesupport gem
final commit before merging stable branch to master
commit before ours merge stable -> master