adding new blog entry
updating .gitignore
fixing merge conflicts
fixing merge conflict
Merge branch 'master' into gh-pages
fixing merge conflict in footer