hp update
Merge http://github.com/nsharman/cs313