Code conflicts resolved

Added classes for Score persistence handling. In progress - #1