Merge pull request #3 from csce431-e/master

updating again
console shows buttons do alter state correctly, colors not changing in GUI to reflect altered state
Merge pull request #22 from jcrabb13/master

more GUI