diff --git a/freechat-client/Makefile b/freechat-client/Makefile
index 57b3119..7e8e22d 100644
--- a/freechat-client/Makefile
+++ b/freechat-client/Makefile
@@ -2,13 +2,18 @@
 sass=static/sass/
 css=static/css/
 
-all: sass run
+all: build-sass run
 
-sass:
-	sh scripts/build-sass.sh
+live: watch-sass run
+
+build-sass:
+	sh scripts/build-sass.sh build
+
+watch-sass:
+	sh scripts/build-sass.sh watch &
 
 run:
 	npm start
 
 clean:
-	rm -f $(css)/*
\ No newline at end of file
+	rm -f $(css)/*
diff --git a/freechat-client/scripts/build-sass.sh b/freechat-client/scripts/build-sass.sh
index afa5f9f..5da3776 100644
--- a/freechat-client/scripts/build-sass.sh
+++ b/freechat-client/scripts/build-sass.sh
@@ -3,6 +3,18 @@
 sassDir='src/sass/'
 cssDir='src/css/'
 
-for i in $sassDir/*;do
-    sass $i $cssDir/`basename -s .scss $i`.css
-done
\ No newline at end of file
+build() {
+    for i in $sassDir/*;do
+        sass $i $cssDir/`basename -s .scss $i`.css
+    done
+}
+
+watch() {
+    pairs=''
+    for i in $sassDir*;do
+        pairs="$i:$cssDir`basename -s .scss $i`.css $pairs"
+    done
+    sass --watch $pairs
+}
+
+"$@"
\ No newline at end of file