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

diff --combined Cargo.toml
index a45129c741c3383f3d30220412cc53cd769c3f0d,0d51822eab0606e141ab3dcf4c8350f69a8950d7..58e3bbc22ad6570ae7d229cec816c40e666d9246
--- 1/Cargo.toml
--- 2/Cargo.toml
+++ b/Cargo.toml
@@@ -1,13 -1,14 +1,14 @@@
  [package]
  name = "mandelwow"
 -version = "0.1.0"
 +version = "0.2.0"
  authors = ["Bernie Innocenti <bernie@codewiz.org>"]
  
  [dependencies]
  glium = "*"
  glutin = "*"
- genmesh = "0.4"
+ genmesh = "0.4.1"
  obj = { version = "0.5", features = ["usegenmesh"] }
+ libxm = "1.0.0"
  
  [[bin]]
  name = "mandelwow"