logo
Merge branch 'master' of https://github.com/emmagrisot/preview

Conflicts:
	css/style.less