From 23f13a83847aad142aa9a1241e585c2778d0a05a Mon Sep 17 00:00:00 2001
From: Nicolas Bornand <nicolas74@gmail.com>
Date: Sun, 11 May 2014 12:03:44 +0200
Subject: Merge origin/master

Conflicts:
	app/js/services.js
---
 app/js/directives.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/js/directives.js b/app/js/directives.js
index 4bdd45b..f1c59b7 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -35,9 +35,10 @@ app.directive('pgLine', function () {
 				// Create a new path and set its stroke color to black:
 				path = new paper.Path({
 					segments: [event.point],
-					strokeColor: 'black',
-					strokeWidth: 2,
-					fullySelected: true
+					strokeColor: 'rgba(7,140,255,.5)',
+					strokeWidth: 100,
+					fullySelected: true,
+                                        strokeCap: 'round'
 				});
             	selected = null;
       		};
@@ -63,7 +64,7 @@ app.directive('pgLine', function () {
 			var points = Array();
 
 			// When the mouse is released, simplify it:
-			path.smooth();
+			path.simplify(1);
 	
 			for(var i=0; i<path._segments.length; i++)
 			{
-- 
cgit v1.2.3