fixing merge conflict
updating footer for new year and adding blog entry about nova networkers meetup
Merge branch 'master' into gh-pages
fixing merge conflict in footer