hw
Merge https://github.com/gmicros/cs595-f14