changing some text, adding logo
merge