Merge branch 'master' into libgdx

Author: cpowell

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
-ecs_game.jar
+recf.jar
 *.dat
 log.txt

README.md

@@ -56,7 +56,7 @@ package for your game as follows:
 
 ...and run it:
 
-    $ java -jar ./ecs_game.jar
+    $ java -jar ./recf.jar
 
 # Further reading about Entity-Component Frameworks
 Entity Component systems are quite different from Object Oriented Programming, especially

bin/main.rb

@@ -14,7 +14,7 @@
 $:.push File.expand_path('../../lib/ruby/', __FILE__)
 
 # Need a different root when inside the jar, luckily $0 is "<script>" in that case
-RELATIVE_ROOT = $0['<'] ? 'ecs_game/' : ''
+RELATIVE_ROOT = $0['<'] ? 'recf/' : ''
 
 require 'java'
 require "gdx-backend-lwjgl-natives.jar"