Initial state and state test check-in
Merge branch 'master' of https://github.com/rohansood1987/sit_n_go_staging