added blog content 2012 through current
fixing merge conflicts