From 11d5e947ff9b4113ec8f9b8c1f1b7659d07c3963 Mon Sep 17 00:00:00 2001
From: Sean Hinchee <henesy@users.noreply.github.com>
Date: Mon, 24 Jul 2017 22:15:58 -0500
Subject: [PATCH] moving things around

---
 READMEOLD.md                             | 41 ------------------------
 config.json.example => disco.cfg.example |  0
 websocket/.gitignore                     | 25 ---------------
 websocket/.travis.yml                    | 19 -----------
 4 files changed, 85 deletions(-)
 delete mode 100644 READMEOLD.md
 rename config.json.example => disco.cfg.example (100%)
 delete mode 100644 websocket/.gitignore
 delete mode 100644 websocket/.travis.yml

diff --git a/READMEOLD.md b/READMEOLD.md
deleted file mode 100644
index cb12da32161d7ab77a233fcfb2d95b5ef1469358..0000000000000000000000000000000000000000
--- a/READMEOLD.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# discord-cli
-Minimalistic Command-Line Interface for Discord
-
-Master (Semi-Stable): [![Build Status](https://travis-ci.org/Rivalo/discord-cli.svg?branch=master)](https://travis-ci.org/Rivalo/discord-cli), Develop (Default Git Branch): [![Build Status](https://travis-ci.org/Rivalo/discord-cli.svg?branch=develop)](https://travis-ci.org/Rivalo/discord-cli)
-
-Join our Discord Chat! https://discord.gg/0pXWCo5RQbVuFHDM
-
-![I suck at English, while 256 colors is enough for everyone](screenshot.png)
-
-<sub>Disclaimer: Currently only tested on Linux.</sub>
-
-### How to Install the Master branch?
-Currently the easiest working way to install is to use the Go tools. I'm looking at using GCCGO and makefiles to reduce installation steps, and make setting PATHS unnecessary.
-* Install the Go Tools and setup the `$GOPATH` (There are loads of tutorial for this part)
-* `$ go get -u github.com/Rivalo/discord-cli`
-* Go to the `bin` folder inside your `$GOPATH`
-* `./discord-cli`
-
-For trying the develop branch, do a git checkout and reinstall the application.
-
-### (Master) Configuration Settings
-Configuration files are being stored in JSON format and are automatically created when you first run discord-cli. Do not change the 'key' value inside `{"key":"value"}`, this is the part that discord-cli uses for parsing, missing keys will definitely return errors.
-
-| Setting       | Function         |
-| ------------- |-------------|
-| username      | Discord Username (emailaddress) |
-| password      | Discord Password |
-| messagedefault| (true or false) Display messages automatically|
-| messages   | Amount of Messages kept in memory |
-
-NOTE: The Configuration settings are likely to change. Breaking updates are stated in the release section. To solve problems, delete `~/.config/discord-cli/config.json` and restart discord-cli.
-
-### (Master) Chat Commands
-When inside a text channel, the following commands are available:
-
-| Command       | Function         |
-| ------------- |-------------|
-| :q      | Quits discord-cli |
-| :g      | Change listening Guild|
-| :c      | Change listening Channel inside Guild |
-| :m [n]      | Display last [n] messages: ex. `:m 2` displays last two messages |
diff --git a/config.json.example b/disco.cfg.example
similarity index 100%
rename from config.json.example
rename to disco.cfg.example
diff --git a/websocket/.gitignore b/websocket/.gitignore
deleted file mode 100644
index ac710204fa195a2a4f17fde1fa75f15ba8c2b714..0000000000000000000000000000000000000000
--- a/websocket/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-
-.idea/
-*.iml
\ No newline at end of file
diff --git a/websocket/.travis.yml b/websocket/.travis.yml
deleted file mode 100644
index 3d8d29cf34bef61e9fabb7031589d56fc90fe52d..0000000000000000000000000000000000000000
--- a/websocket/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: go
-sudo: false
-
-matrix:
-  include:
-    - go: 1.4
-    - go: 1.5
-    - go: 1.6
-    - go: 1.7
-    - go: 1.8
-    - go: tip
-  allow_failures:
-    - go: tip
-
-script:
-  - go get -t -v ./...
-  - diff -u <(echo -n) <(gofmt -d .)
-  - go vet $(go list ./... | grep -v /vendor/)
-  - go test -v -race ./...