all css changes resolve #28 Aug vaibhav
Merge pull request #311 from vaibhavcisin274/vaibhav

all css changes resolve #28 Aug vaibhav
remove conflicts