icon changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/favicon.ico
	index.html