Reorganized folders
update scene

update scene
Folder structure cleaning

Created a folder for the old scripts to keep the folder structure clean.
Refactored, added test usage of EventManager

Event Manager updated, added in a example TestListener showing a usage
of the manager, refactored names of managers
Figuring out how to solve the conflict

Conflict solving
Conflict solving 2

Seems like the scene was conflicting, so I’m trying to delete it to get
a fresh copy
Corrected scene

Finally!
Small state changes
Added Conversation script

Conversation script contains the two main methods to get information
from both NPCs and Objects
Add ArrayLists roomList, npcList, weaponList
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks into JohnMai-master

Conflicts:
	Assets/Scenes/stage1.unity
Merge pull request #12 from alim4/JohnMai-master

alim4's code into JohnMai's
Conversation fixes

Correcting use of enums as ints.
change scene

scene
Revert f7644b5..1403be3

This rolls back to commit f7644b55ab1287d02fc77ff7d01af475d62fa513.
merge testing

merge testing
Updating to John's state

Trying to solve eternal conflicts…
Merge pull request #1 from JohnMai/master

Setting up to date stuff
Conversations

Modified GameManager access.
Updated Game manager

Made lists public.