branch test
*feature1, AND simple in readme.txt
*master, & simple in readme.txt
*master, comflict fixed in readme.txt
strategy of branch management
*master: merge --no-ff with *dev
fix bug 101
merged bug fix 101
Merge branch 'master' of github.com:Samsen/gemsnail