added/deleted images, added/edited content
added/edited links, edited tags
Merge branch 'gh-pages'