Merge branch 'master' into updates2222

Author: Pablo Fernandez

src/scaleplayer/scaleplayer.fxml.css

@@ -1,6 +1,7 @@
 /*
- * Button styling
+ * Our CSS Button styling 
  */
+
 #closeButton {
     -fx-background-color: pink; 
     -fx-border-color: red;