first draft for 2.3
Merge branch 'master' of github.com:james7132/RIP2014-HW1