howchihlee/trygit — pull request #1 by dboyliao (2014-12-23 08:57:37+00:00)
Title: Merge Conflict

Try merge conflict