old stuff comitted before merging
Merge branch 'master' of https://github.com/jerold/SE422

Conflicts:
	hw3/statemachine.use
fps use file