updated flags and scene 2
updated some names
working on scene 3
fixed merge conflict with characters