trying to merge some stuff
Added onStateChanged

Added onStateChanged
Moving folders around.
Merge branch 'master' of https://github.com/MadTrial/Volge-TheSurvivor