delete LICENSE
study 2014.06.03
branch test
AND simple
& simple
conflict fixed
test no-ff
merge with no-ff
add hello.txt