Merge pull request #35 from COPPER-BOBCAT/staging

Staging
Updated styles, added chaity donation page
Conflict res
Added minor link styling
Merge pull request #36 from RTakes/conflict-res

Conflict res