merged after pull from remote

css/piskel.css

@@ -1,36 +0,0 @@
-html, body {
-	height : 100%;
-}
-
-.debug {
-	border : 1px Solid black;
-}
-
-.left-nav {
-	position:absolute;
-	top : 0;
-	bottom : 0;
-	width : 200px;
-	background : #000;
-}
-
-.main-panel {
-	position:absolute;
-	top : 0;
-	bottom : 0;
-	left : 200px;
-	right : 0;
-	background : #ccc;
-}
-
-.preview-container {
-	position : absolute;
-	top : 30px;
-	right : 0;
-	height : 200px;
-	width : 200px;
-	background : white;
-	border : 0px Solid black;
-	border-radius:5px 0px 0px 5px;
-	box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
-}

js/frameSheetModel.js

@@ -1,4 +1,3 @@
-
 var FrameSheetModel = (function() {
     
     var inst;
@@ -18,6 +17,7 @@ var FrameSheetModel = (function() {
 		validate: function() {
 			return true; // I'm always right dude
 		},
+
 		getAllPixels : function () {
 			var pixels = [];
 			for (var i = 0 ; i < frames.length ; i++) {

js/piskel.js

@@ -3,7 +3,6 @@
 
       // Constants:
       TRANSPARENT_COLOR = 'tc',
-      //TRANSPARENT_COLOR = 'pink',
       DEFAULT_PEN_COLOR = '#000000',
 
       // Configuration:
@@ -115,6 +114,7 @@
 
         drawingAreaContainer.setAttribute('style', 
           'width:' + framePixelWidth * drawingCanvasDpi + 'px; height:' + framePixelHeight * drawingCanvasDpi + 'px;');
+
         drawingAreaCanvas.setAttribute('oncontextmenu', 'piskel.onCanvasContextMenu(event)');
         drawingAreaContainer.appendChild(drawingAreaCanvas);
 
@@ -122,7 +122,6 @@
         body.setAttribute('onmouseup', 'piskel.onCanvasMouseup(event)');
         drawingAreaContainer.setAttribute('onmousedown', 'piskel.onCanvasMousedown(event)');
         drawingAreaContainer.setAttribute('onmousemove', 'piskel.onCanvasMousemove(event)');
-
         this.drawFrameToCanvas(frameSheet.getFrameByIndex(this.getActiveFrameIndex()), drawingAreaCanvas, drawingCanvasDpi);
     },
 
@@ -174,6 +173,7 @@
         }
         $("display-fps").innerHTML = animPreviewFPS + " fps";
         animFPSTuner.value = animPreviewFPS;
+        $("fps-value").innerHTML = animPreviewFPS + " fps";
         refreshUpdater = startPreviewRefresh();
       });
     },
@@ -357,6 +357,7 @@
       event.cancelBubble = true;
       return false;
     },
+
     onPaletteClick : function (event) {
       var color = event.target.getAttribute("data-color");
       if (null !== color) {
@@ -378,4 +379,5 @@
   window.piskel = piskel;
   piskel.init();
 
-})(function(id){return document.getElementById(id)});
+})(function(id){return document.getElementById(id)});
+//small change for checking my git setup :(