resolve conflict local to remote
Merge pull request #44 from toannguyenle/steve_monday

resolve conflict local to remote