improved night
merging
merging
fix more merge conflicts
using old deer texture
tree has lightning applied to it