favicon
Merge branch 'develop' of https://github.com/etivano/stillalive into develop

Conflicts:
	app/views/layouts/application.html.erb