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

Conflicts:
	app/views/layouts/application.html.erb
add public in index
Merge branch 'develop' of github.com:etivano/stillalive into develop
rank
dynamic note
Merge branch 'develop'