commit
steps.
1. sync it was showing conflict
2. mearge -> it will mage a branch 
3. commit (it will show non-fast forwarding erro)
4. pull (it will shwor the conflict file in read )
5. use mearge tool to fix the conflict
6. add to index that file 
7. commit the file 


Merge branch 'master' of
https://github.com/bikeshtricon/pyramid_test.git

Conflicts:
	README.txt