update scene

update scene
Folder structure cleaning

Created a folder for the old scripts to keep the folder structure clean.
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!
Added Conversation script

Conversation script contains the two main methods to get information
from both NPCs and Objects
Conversation fixes

Correcting use of enums as ints.
Revert f7644b5..1403be3

This rolls back to commit f7644b55ab1287d02fc77ff7d01af475d62fa513.
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.
Merge pull request #14 from mentatzoe/master

Test
try to fix bugs after merge

try to fix bugs after merge
test again

test again
test again again

test again
Merge pull request #3 from JohnMai/master

Merging JohnMai's into alim4