Update README.md
Added forgotten ico
Fixed README.rst conflict

Removing the conflicting README.rst version that would overwrite recent changes.
Merge branch 'fuel-3.1' of github.com:tylerregas/fuel-docs into fuel-3.1

Conflicts:
	README.md

	modified:   pages/about-fuel/0020-what-is-fuel.rst
	modified:   pages/installation-fuel-ui/red_hat_openstack.rst

Committing modified pages without README.rst
REALLY fixed README.rst conflict