for merge
Merge branch 'master' of github.com:KevinXuxuxu/XuetangProject
tests of cucumber in /features
Merge branch 'master' of github.com:KevinXuxuxu/XuetangProject