first commit
changed from zach to peter
changed css to fit my name better
fixed merge conflict