Initial commit
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   Makefile
	deleted:    README.md
	new file:   src/Makefile
	new file:   src/interface.h
	new file:   src/widget/interface.h
Create README.md
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   README.md
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   README.md
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch and 'origin/master' have diverged,
 and have 5 and 5 different commits each, respectively.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   README.md
Merge branch 'master' of https://github.com/anhonghe/d2im

Conflicts:
	README.md