Merge branch 'master' of https://github.com/LucasBeltrame/Musalizer

Conflicts: README.md
LucasBeltrame · Jan 20, 2016 · 2c39a4c · 2c39a4c
2 parents 411b5f1 + 0b429c4
commit 2c39a4c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Musalizer
-3D Music Visualizator in WebGL
+3D Music Viewer in WebGL
 
 ## How to use it