heytour <<<<<<< HEAD alan'commit ======= alan'commit 1 alan'commit 2 alan'commit 2 alan'commit 4 alan'commit 5 Johnny's commit 1 ======= alan'commit 4 lijing's commit 1 Johnny's commit 1 testing merge sharie2 comiit 352183edf9540af40f55c93db65e6cf2433b1ad2 Yulu comiit