4/30 merge

hopefully will merge my photos, quotes, favicon, twitter and fb icons with latest color and layout