16 files changed, 28 insertions, 16 deletions

diff --git a/INSTALL.md b/INSTALL.md
index a0c4165d..db6387e7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -55,26 +55,39 @@ make
 <a name="osx" />
 ###OS X:
 
+You need the latest XCode with the Developer Tools (Preferences -> Downloads -> Command Line Tools).
+The following libraries are required along with libsodium and cmake for Mountain Lion and XCode 4.6.3 install libtool, automake and autoconf. You can download them with Homebrew, or install them manually.
+
+There are no binaries/executables going to /bin/ or /usr/bin/ now. Everything is compiled and ran from the inside your local branch.
+
 <a name="homebrew" />
 ####Homebrew:
 ```
 brew install libtool automake autoconf libconfig libsodium cmake
 cmake .
 make
-sudo make install
 ```
 
 <a name="non-homebrew" />
 ####Non-homebrew:
 
-Much the same as Linux, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
-Users running Mountain Lion and the latest version of XCode (4.6.3) will also need to install libtool, automake and autoconf.
-They are easy enough to install, grab them from http://www.gnu.org/software/libtool/, http://www.gnu.org/software/autoconf/ and http://www.gnu.org/software/automake/, then follow these steps for each:
+Grab the following packages:
+  * http://www.gnu.org/software/libtool/
+  * http://www.gnu.org/software/autoconf/ 
+  * http://www.gnu.org/software/automake/
+
+Then follow these steps for each:
 
 ```bash
 ./configure
 make
-sudo make install
+```
+
+In your local TOX repository:
+
+```bash
+cmake .
+make
 ```
 
 Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
diff --git a/core/libcore.a b/core/libcore.a
new file mode 100644
index 00000000..1e9e8df6
--- /dev/null
+++ b/core/libcore.a
diff --git a/data b/data
new file mode 100644
index 00000000..2d2201c8
--- /dev/null
+++ b/data
diff --git a/fa.txt b/fa.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/fa.txt
diff --git a/other/DHT_bootstrap b/other/DHT_bootstrap
new file mode 100755
index 00000000..3d4b6484
--- /dev/null
+++ b/other/DHT_bootstrap
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon
new file mode 100755
index 00000000..10b732f9
--- /dev/null
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon
diff --git a/testing/DHT_test b/testing/DHT_test
new file mode 100755
index 00000000..e6bfa920
--- /dev/null
+++ b/testing/DHT_test
diff --git a/testing/Lossless_UDP_testclient b/testing/Lossless_UDP_testclient
new file mode 100755
index 00000000..02367ce9
--- /dev/null
+++ b/testing/Lossless_UDP_testclient
diff --git a/testing/Lossless_UDP_testserver b/testing/Lossless_UDP_testserver
new file mode 100755
index 00000000..7e00d35f
--- /dev/null
+++ b/testing/Lossless_UDP_testserver
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index 84a64b38..763996e8 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -155,8 +155,9 @@ int main(int argc, char *argv[])
     //bind to ip 0.0.0.0:PORT
     IP ip;
     ip.i = 0;
+    //ip.c = 0x7F000001;
     init_networking(ip, PORT);
-    perror("Initialization");
+    //perror("Initialization");
     
     int connection;
     uint64_t timer = current_time();
diff --git a/testing/Messenger_test b/testing/Messenger_test
new file mode 100755
index 00000000..008f34a0
--- /dev/null
+++ b/testing/Messenger_test
diff --git a/testing/file.txt b/testing/file.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/testing/file.txt
diff --git a/testing/nTox b/testing/nTox
new file mode 100755
index 00000000..59954888
--- /dev/null
+++ b/testing/nTox
diff --git a/testing/toxic/data b/testing/toxic/data
new file mode 100644
index 00000000..b6e1f6cc
--- /dev/null
+++ b/testing/toxic/data
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index cdc6dc16..9614d7f4 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -282,7 +282,7 @@ void prepare_window(WINDOW* w) {
 
 int main(int argc, char* argv[]) {
   int ch;
-  ToxWindow* a;
+  ToxWindow* current_window;
 
   init_term();
   init_tox();
@@ -294,22 +294,20 @@ int main(int argc, char* argv[]) {
     do_tox();
 
     // Draw.
-    a = &windows[w_active];
-    prepare_window(a->window);
-    a->blink = false;
-    a->onDraw(a);
+    current_window = &windows[w_active];
+    prepare_window(current_window->window);
+    current_window->blink = false;
+    current_window->onDraw(current_window);
     draw_bar();
 
     // Handle input.
     ch = getch();
     if(ch == '\t') {
       w_active = (w_active + 1) % w_num;
-    }
-    else if(ch == KEY_BTAB) {
+    } else if(ch == KEY_BTAB) {
       w_active = (w_active + w_num - 1) % w_num;
-    }
-    else if(ch != ERR) {
-      a->onKey(a, ch);
+    } else if(ch != ERR) {
+      current_window->onKey(current_window, ch);
     }
 
   }
diff --git a/testing/toxic/toxic b/testing/toxic/toxic
new file mode 100755
index 00000000..6bd0dd78
--- /dev/null
+++ b/testing/toxic/toxic