gitskill test branch add
add readme.txt file for test
add in master for t
add in feature2
add in master 2
conflict fixed
add in feature1
add in issue-002
commit changes file
add devstashtest.txt
add branchdev confict