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

Conflicts:
	assign1