Finish assignment 0
Merge branch 'master' of https://github.com/yg2014/POSA-14