Merge remote-tracking branch 'refs/remotes/origin/master' into heroku
rma
rca
removes favicon
changes
Merge remote-tracking branch 'refs/remotes/origin/heroku'