Added instance variables
merged conflicts
gameplay not working
Merge pull request #11 from 4justinstewart/gameplay

Gameplay