Updated Generic variables to be State and Observation
changed generic to be s and o
Changed the generics to S and O
S and O as generics
changed generic to State
Merge branch 'master' of https://github.com/chiped/MusicApp