test
Merge branch 'master' of https://github.com/pulsarhealthcare/halloween

Conflicts:
	assets/Characters/Pumpkin-02.png
	assets/Characters/Vampire-01.png
	assets/Characters/Vampire-02.png
	assets/Characters/Witch-01_v2.png
	assets/Characters/Witch-02_v2.png
	assets/Collectible items/Collectable items-01.png
	assets/Collectible items/Collectable items-02.png
	assets/Collectible items/Collectable items-03.png
	assets/Collectible items/Collectable items-04.png
	assets/Collectible items/Collectable items-05.png
	assets/Collectible items/Collectable items-06.png
	assets/Collectible items/Collectable items-07.png
	assets/Collectible items/Collectable items-08.png
	assets/Collectible items/Collectable items-09.png
	assets/Collectible items/Collectable items-10.png
	assets/Graveyard_objects/Graveyard_background.png
	assets/Graveyard_objects/Graveyard_objects-02.png
	assets/Graveyard_objects/Graveyard_objects-03.png
	assets/Graveyard_objects/Graveyard_objects-04.png
	assets/Graveyard_objects/Graveyard_objects-05.png
	assets/Graveyard_objects/Graveyard_objects-07.png
	assets/Graveyard_objects/Graveyard_objects-08.png
	assets/Graveyard_objects/Graveyard_objects-09.png
	assets/Graveyard_objects/Graveyard_objects-10.png
	assets/Graveyard_objects/Graveyard_objects-11.png
	assets/Graveyard_objects/Graveyard_objects-12.png
	assets/Graveyard_objects/Graveyard_objects-13.png
	assets/Graveyard_objects/Graveyard_objects-14.png
	assets/Graveyard_objects/Graveyard_objects-15.png
	assets/Graveyard_objects/Graveyard_objects-16.png
	assets/Graveyard_objects/Graveyard_objects-17.png
	assets/Graveyard_objects/Graveyard_objects-18.png
	assets/Graveyard_objects/Graveyard_objects-19.png
	assets/Graveyard_objects/Graveyard_objects-20.png
	assets/Graveyard_objects/Graveyard_objects-21.png
	assets/Graveyard_objects/Graveyard_objects-22.png
	assets/Graveyard_objects/Graveyard_objects-23.png
	assets/Graveyard_objects/Graveyard_objects-24.png
	assets/Halloween Title screens/Leaderboard screen-07.png
	assets/Halloween Title screens/Swamp title screen-10.png
	assets/Halloween game_example screen layout.pdf
	assets/HauntedHouse_objects/HauntedHouse_background.png
	assets/HauntedHouse_objects/HauntedHouse_objects-01.png
	assets/HauntedHouse_objects/HauntedHouse_objects-02.png
	assets/HauntedHouse_objects/HauntedHouse_objects-03.png
	assets/HauntedHouse_objects/HauntedHouse_objects-04.png
	assets/HauntedHouse_objects/HauntedHouse_objects-05.png
	assets/HauntedHouse_objects/HauntedHouse_objects-06.png
	assets/HauntedHouse_objects/HauntedHouse_objects-07.png
	assets/HauntedHouse_objects/HauntedHouse_objects-08.png
	assets/HauntedHouse_objects/HauntedHouse_objects-09.png
	assets/HauntedHouse_objects/HauntedHouse_objects-10.png
	assets/HauntedHouse_objects/HauntedHouse_objects-11.png
	assets/HauntedHouse_objects/HauntedHouse_objects-12.png
	assets/HauntedHouse_objects/HauntedHouse_objects-13.png
	assets/HauntedHouse_objects/HauntedHouse_objects-14.png
	assets/HauntedHouse_objects/HauntedHouse_objects-15.png
	assets/HauntedHouse_objects/HauntedHouse_objects-16.png
	assets/HauntedHouse_objects/HauntedHouse_objects-17.png
	assets/HauntedHouse_objects/HauntedHouse_objects-18.png
	assets/HauntedHouse_objects/HauntedHouse_objects-19.png
	assets/HauntedHouse_objects/HauntedHouse_objects-20.png
	assets/HauntedHouse_objects/HauntedHouse_objects-21.png
	assets/HauntedHouse_objects/HauntedHouse_objects-22.png
	assets/HauntedHouse_objects/HauntedHouse_objects-23.png
	assets/HauntedHouse_objects/HauntedHouse_objects-24.png
	assets/Swamp_objects/Swamp_background.png
	assets/Swamp_objects/Swamp_objects-01.png
	assets/Swamp_objects/Swamp_objects-02.png
	assets/Swamp_objects/Swamp_objects-03.png
	assets/Swamp_objects/Swamp_objects-04.png
	assets/Swamp_objects/Swamp_objects-05.png
	assets/Swamp_objects/Swamp_objects-06.png
	assets/Swamp_objects/Swamp_objects-07.png
	assets/Swamp_objects/Swamp_objects-08.png
	assets/Swamp_objects/Swamp_objects-09.png
	assets/Swamp_objects/Swamp_objects-10.png
	assets/Swamp_objects/Swamp_objects-11.png
	assets/Swamp_objects/Swamp_objects-12.png
	assets/Swamp_objects/Swamp_objects-13.png
	assets/Swamp_objects/Swamp_objects-14.png
	assets/Swamp_objects/Swamp_objects-15.png
	assets/Swamp_objects/Swamp_objects-16.png
	assets/Swamp_objects/Swamp_objects-17.png
	assets/Swamp_objects/Swamp_objects-18.png
	assets/Swamp_objects/Swamp_objects-19.png
	assets/Swamp_objects/Swamp_objects-20.png
	assets/Swamp_objects/Swamp_objects-21.png
	assets/Swamp_objects/Swamp_objects-22.png
	assets/Swamp_objects/Swamp_objects-23.png
	assets/Swamp_objects/Swamp_objects-24.png
	assets/Swamp_objects/Swamp_objects-25.png
	assets/Swamp_objects/Swamp_objects-26.png
	assets/Update Halloween Game copy.zip
	css/styles.css
	index.html
	js/00_init.js
	js/01_resources.js
	js/02_character.js
	js/04_collectables.js
	js/football.js