Added cutscened and sprite classes
Fixed merge conflicts