some cleanup
Merge branch 'master' of https://github.com/drayson92/sp2014.11-731

Conflicts:
	hw3/decode
future cost fixes