a readme file
we decide to implement a new feature next version.
Another feature would be implemented.
Fix a big problem.

<<<<<<< HEAD
Maybe there is another emergency problem should be sloved.
=======
We encounter a big problem, slove it!
>>>>>>> issue151

We merge the two bug fix.