Added about me page stuff
Added about me page stuff
fixing merge in setup