Revamp

added the "Meet Us" box to about
okay, remove all the git conflict tags, then commit again.