working on logic for day 1 music/arrows and such
Merge branch 'master' of https://github.com/jbcon/Promotion
soooo many conflicts, hopefully i merged them correctly

Conflicts:
	Promotion/res/images/N_map01.tmx
	Promotion/src/globals.js
	Promotion/src/night.js
	Promotion/src/night_Animation_Layer.js
	Promotion/src/night_Background_Layer.js
	Promotion/src/night_check.js
	Promotion/src/resource.js