hw1 draft committed
fix for new year
Merge branch 'master' of https://github.com/clab/sp2014.11-731