Adding Day and night

oh oh at night
Merge remote-tracking branch 'origin/master' into MaxxTesting