fix icons on about-us
Merge branch 'master' of github.com:maskrz/ZPI

Conflicts:
	app/views/home/main.html.erb
Merge branch 'master' of github.com:maskrz/ZPI
Merge branch 'master' of github.com:maskrz/ZPI

Conflicts:
	app/views/partials/_about_us.html.erb