added favicon
Merge branch 'master' into feat/add_pretty

Conflicts:
	app/views/users/show.html.erb