merged
Merge branch 'master' of https://github.com/iuval/furry-octo-avenger

Conflicts:
	CrystalClash/CrystalClash/bin/pruebas/Accessors/ActorAccessor.class
	CrystalClash/CrystalClash/bin/pruebas/CrystalClash/CrystalClash.class
	CrystalClash/CrystalClash/bin/pruebas/Entities/World.class
	CrystalClash/CrystalClash/bin/pruebas/Networking/ServerDriver.class
	CrystalClash/CrystalClash/bin/pruebas/Renders/WorldRender.class
merged
gitignore