diff --git a/outputs.cfg b/outputs.cfg
index 6326dba..8b8c4e8 100644
--- a/outputs.cfg
+++ b/outputs.cfg
@@ -1,6 +1,9 @@
 [Print]
 filename=print
 enabled=on
+[Log]
+filename=log
+enabled=on
 
 [Xively]
 filename=xively
diff --git a/outputs/log.py b/outputs/log.py
new file mode 100644
index 0000000..697186b
--- /dev/null
+++ b/outputs/log.py
@@ -0,0 +1,23 @@
+import output
+import datetime
+
+class Log(output.Output):
+	requiredData = []
+	optionalData = []
+	def __init__(self,data):
+		pass
+	def outputData(self,dataPoints):
+		f = open('sensors.log', 'a')
+		logline = '{"time":"'
+		logline += str(datetime.datetime.now())
+		logline += '",'
+		for i in dataPoints:
+			logline += '"' + i["name"] + '"' + ":" + '"' + str(i["value"]) + '"'
+		
+		logline += "}\n"
+		
+		print(logline)
+		f.write(logline)
+		f.close()
+		
+		return True