Background and color scheme chosen.
Paragraph font and color adjustments made.
Local file conflicts fixed.

Merge branch 'master' of https://github.com/cvetter34/project3