Fixed the initial design of hw1 after meeting(4/14)
Merge branch 'master' of https://github.com/2014-sed-team3/term-project