I have added my name
sdkjflasdkfj

dfasf
Merge branch 'master' into lazine

Conflicts:
	.DS_Store
	README.md
	WhitePigeon.pro.user
addtoolbar

addtoolbar
add some gui

add some gui
lalala

lalala
….

….
Merge branch 'master' into lazine

Conflicts:
	.DS_Store
i'm lzx.
i'm lzx.
Merge branch 'master' of https://github.com/bg95/WhitePigeon into lazine

Conflicts:
	README.md
	WhitePigeon.pro
	mainwindow.cpp
	mainwindow.h
I'm lazine
hello world i am lazine
merge the master
Singing Part. Do not laugh.
Merge branch 'master' of https://github.com/bg95/WhitePigeon into Pt-Cr
version 2013.9.15
version for presentation
Hello World
Merge branch 'lazine' of https://github.com/bg95/WhitePigeon into lazine

Conflicts:
	.DS_Store
	Makefile
	WPScore/WPLib.cpp
	WPScore/WPLib.h
	WPScore/WPPart.cpp
	WPScore/WPPart.h
	WPScore/WPPersistentTree.cpp
	WPScore/WPPersistentTree.h
	WPScore/WPProperty.cpp
	WPScore/WPProperty.h
	WPScore/WPScore.cpp
	WPScore/WPScore.h
	WhitePigeon.pro
	main.cpp