Add logo png to nav
Merge branch 'master' of https://github.com/wendycan/dotide-site into wendycan-master

Conflicts:
	source/stylesheets/_nav.css.scss