merge conflicts resolved
merge conflicts resolved
merge conflicts resolved
took out quotes, styled signature, other things