for craig
Merge branch 'master' of https://github.com/dkirschl/CS307Project