hw2 modify4
Merge branch 'gh-pages' of https://github.com/Sinya/wp2014s_hw1 into gh-pages