Merge branch 'master' of github.com:oseiskar/black-hole

oseiskar · Dec 29, 2015 · 78bd744 · 78bd744
2 parents 17729fa + 2f00b5a
commit 78bd744
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/COPYRIGHT.md b/COPYRIGHT.md
@@ -5,8 +5,7 @@
    - [three.js](https://threejs.org) + components `Detector.js`, `OrbitControls.js` and the moon texture `img/moon_1024.jpg`
    - [stats.js](https://github.com/mrdoob/stats.js)
    - [mustache.js](https://github.com/janl/mustache.js)
-   - [ShaderLoader.js](https://github.com/codecruzer/webgl-shader-loader-js))
-   -
+   - [ShaderLoader.js](https://github.com/codecruzer/webgl-shader-loader-js)
  * The Milky Way image `img/milkyway.jpg` is from http://www.stellarium.org/wiki/index.php/Textures and "based on Nick Risinger's [Photopic Sky Survey](http://skysurvey.org/) image under [CC-BY-NC. Details](http://creativecommons.org/licenses/by-nc/2.0/)."
  * `index.html` also adapted from three.js
  * Other material (C) Otto Seiskari, 2015
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-### Ray-traced simulation of a black hole using
+### Ray-traced simulation of a black hole
 
 _see **[COPYRIGHT.md](https://github.com/oseiskar/black-hole/blob/master/COPYRIGHT.md)** for license and copyright info_