add ?
dev add ? again
master add !
conflict fixed
just for test
merge with no fast forward
issue 101 bug fixed
merge issue-101 without fast forward
add some words
conflict fixed