about and css changes
Merge remote-tracking branch 'remotes/origin/Nitesh' into Kaustubh

Conflicts:
	web/css/style.css