OMFG, implemented save/restore state for like the millionth time
Merge branch 'master' of ssh://git@github.com/danielfinke/cpsc472.git