Some about changes
Conflict resolution
Finsihed about page
small changes
small changes
merge with tim
merge with tim - css fix