stashing
Merge branch 'master' of https://github.com/lunchpad/lunchpad
merging
commit before merge
precompile
Merge branch 'master' of https://github.com/lunchpad/lunchpad
merge
precompile
merging conflicts
precompiling new code
Merge branch 'master' of https://github.com/lunchpad/lunchpad
pulling upstream
small tweaks to front page
precompile
Merge pull request #157 from kheang/master

Changes from heroku, small updates