Added some CSS stuff.
Resolved merge conflicts. Added CSS properties. To do: Add more CSS stuff.
more style stuff.
Merge pull request #10 from bushwack/master

Added some CSS stuff.