Merge branch 'dev' into jeremi

# Conflicts:
#	pkg/utils/FileReceiver.go

pkg/utils/FileSender.go

@@ -0,0 +1,10 @@
+package utils
+
+import (
+	"bufio"
+)
+
+func SendFile(fileName string, fileSize int, writer *bufio.Writer) bool {
+
+	return false
+}