Ziduan_ before deadline
Merge branch 'master' of github.com:alplecture2014/alp2014