styling first draft
Merge remote-tracking branch 'origin/master' into shawn_refactoring
more css
Merge pull request #61 from fence-lizards-2014/shawn_refactoring

Shawn refactoring