Texture & controller
Merge branch 'master' of https://github.com/antoineberry/VoxelExplorer

Conflicts:
	Assets/Prefabs/Resources/voxel.prefab
	Assets/Scripts/Controllers/PersonCtrlScript.cs
	Assets/Scripts/FrustumVoxelScript.cs
	sysinfo.txt
Shader