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

Conflict res
fixed homepage padding
Merge pull request #37 from RTakes/conflict-res

fixed homepage padding
updated settings page
Merge pull request #38 from RTakes/conflict-res

updated settings page
updated demo page
Merge pull request #39 from RTakes/conflict-res

updated demo page
Merge pull request #40 from COPPER-BOBCAT/staging

front end merge