Merge branch 'master' of github.com:wmvanvliet/Chimara

Conflicts:
	player/style.css

diff --combined player/style.css
index 7a37d70d072cdc907018606b60df142de2c87f55,023e0aac9fbe88015eacd02f290093dcbeefc72a..9788fd3e02918efe978b9b9990d82b8180b9a0da
--- 1/player/style.css
--- 2/player/style.css
+++ b/player/style.css
@@@ -27,10 -27,13 +27,12 @@@
   */
  grid {
        font-size: 11;
 -      font-family: "Liberation Mono";
  }
  
  buffer {
+       color: #303030;
        font-size: 11;
+       margin-bottom: 5;
  }
  
  grid.user1 {
@@@ -38,8 -41,13 +40,12 @@@
        background-color: #ffffff;
  }
  
+ buffer.emphasized {
+       font-size: 14;
+ }
+ 
  buffer.header {
        font-weight: bold;
 -      text-align: center;
  }
  
  buffer.subheader {