see if this works
Merge https://github.com/sblanch/CS240