stylezzz
merged new css and fixed conflicts
Merge pull request #10 from fox-squirrels-2013/style_branch

Style branch