commit
Merge https://github.com/fpruter/cs595-f14