New about page
Merge branch 'master' of https://github.com/ido172/Diaper

Conflicts:
	DiaperClient/public_html/css/styles.css