# Conflicts:
#	Zookeepers Trial/Assets/Scenes/Town01.unity
#	Zookeepers Trial/Library/CurrentLayout.dwlt
#	Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt
#	Zookeepers Trial/Library/LastSceneManagerSetup.txt
#	Zookeepers Trial/Library/assetDatabase3
#	Zookeepers Trial/Library/expandedItems
#	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
#	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000

assets -> create -> new potion/armour

no longer can "enter" it

This reverts commit fc0f1ccb.

got a few buttons going (character doesnt transfer over yet)

- Character is now sperated into seperate parts
- All new animations for each action
- Weapon swapping is added
	-> Create weapon asset, add sprite, drag onto players 'weapon'
	object (see hierarchy)
- A bit of organizing, feel free to do more

Enemy is taking damage but player is still not....for some reason

entering a door area triggers a text to let the player know how to
enter/exit

Please keep Left is true and Right is false
Started to add player health

Scripts to be used by shops and modify the player stats (not implemented
yet)
Can create new weapons by clicking on the menu Assets > create > new
weapon

YAHOOOO

Main scene with walking animation, doors to other scenes but bug when
exited. (appear at random door)