Merge pull request #15 from Ravenstine/master

Merge forks
Redo styles for site. Change some classes for consistency.
Merge pull request #120 from nicolejpaz/fix_css

Redo styles