Added logo
Merge branch 'CSS'

Conflicts:
	views/index.html