go over git practice
learn commit -a
Merge branch 'master' of github.com:abztrakt/git-practice

Conflicts:
	new.txt
learning mearge
still learning. feature has commit master doesnot
Merge pull request #7 from abztrakt/feature

Feature