Adds logo
Merge branch 'master' of github.com:chloi/yvr-conf-free

Conflicts:
	views/index.html