new feature
on branch feature1
feature1 modify
master commit
comflict fixed
Merge branch 'master' of github.com:Proudmoor/gitskills