Merge branch 'fmt' of cwtch.im/cwtch into master

app/tui/main.go

@@ -1,14 +1,14 @@
 package main
 
 import (
-	"fmt"
-	"log"
-	"time"
 	"cwtch.im/cwtch/peer"
+	"fmt"
 	"github.com/marcusolsson/tui-go"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
+	"time"
 )
 
 func main() {

server/serverConfig.go

@@ -1,12 +1,12 @@
 package server
 
 import (
-	"sync"
+	"crypto/rsa"
+	"encoding/json"
 	"github.com/s-rah/go-ricochet/utils"
 	"io/ioutil"
 	"log"
-	"encoding/json"
-	"crypto/rsa"
+	"sync"
 )
 
 // Reporting is a struct for storing a the config a server needs to be a peer, and connect to a group to report