ignore blog.wsgi
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
ignore vim cache files