About page
added button and merge
merge
merge2