liutenghou/pushPullTest2 — pull request #2 by umyta (2014-01-26 09:23:35+00:00)
Title: Changed hii into what trying to make a conflict

Let me know if you get a conflict?