update
Merge branch 'master' of https://github.com/summit2013/10_18_homework