Revamp

added the "Meet Us" box to about
I should not be seeing all these conflict tags