gitignore
Merge branch 'master' of git://github.com/mhoofman/wordpress-heroku