trees
Merge branch 'master' of https://github.com/Aasagi/LumberjackFantasies

Conflicts:
	Assets/Textures_n_Materials/tree2_diffuse 1.psd
	Assets/Textures_n_Materials/tree3_diffuse.psd