about-us page
Merge branch 'master' of github.com:maskrz/ZPI

Conflicts:
	layouts/landing-page.psd