Merge branch 'master' into gh-pages

byuweb · Jan 30, 2015 · c6148b3 · c6148b3
2 parents c293bc9 + 5538bf6
commit c6148b3
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 106 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -115,6 +115,7 @@ module.exports = (grunt) ->
 			server:
 				options:
 					port: 9001
+					livereload: 9002
 
 		watch:
 			options:
@@ -142,4 +143,4 @@ module.exports = (grunt) ->
 
 	# Default task(s).
 	grunt.registerTask('compile', ['sass', 'autoprefixer', 'jade', 'jshint', 'uglify'])
-	grunt.registerTask('default', ['compile', 'connect', 'watch'])
+	grunt.registerTask('default', ['connect', 'watch'])