running in circles
Merge https://github.com/jamesfisk/cs-343-hw3
merging new files