init 2 @ 2014/3/17
init  @ 2014/3/17
Merge branch 'master' of github.com:SEUHiTrip/trip
init @ 3/17