Fixed state bug
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By vpcombo
# Via vpcombo
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  Merge branch 'master' of https://github.com/hawaiianchimp/CSE135-Project
Adding supporting files