created environment prefabs for floor and wall, created new material (gray) for floor prefab
Merge branch 'master' of github.com:JonTerp/GOON-DarkStar

Conflicts:
	Assets/materials/gray.mat
	Assets/prefabs/environment/Floor.prefab
	Assets/prefabs/environment/Wall.prefab