Merge branch 'master' of ssh://codewiz.org/~/public_git/mandelwow

diff --cc Cargo.toml
index 9c1bd7f403b2a2749f6bc1169d9323f868466027,36dedd851dec40efc90621f5f7f4534f1ec079f8..c7f4875da4cd470264b255096c9bfe8de5e21d31
--- 1/Cargo.toml
--- 2/Cargo.toml
+++ b/Cargo.toml
@@@ -12,12 -12,10 +12,10 @@@ opt-level = 
  
  [dependencies]
  cgmath = "*"
 -glium = "0.16.0"
 -glutin = "0.7.4"
 +glium = "0.17.0"
 +glutin = "0.9"
- genmesh = "0.4.1"
  image = { version = "0.14.0", features = ["png_codec"], optional = true }
  libxm = "1.0.0"
- obj = { version = "0.5", features = ["usegenmesh"] }
  rust-rocket = { path = "rust-rocket", optional = true }
  rand = "*"
  sdl2 = "*"