Add .gitignore
Merge branch 'refs/heads/gitignore' into resolve_urls