added content to homepage and about
fixed merge conflict