testing a commit in diff branch
commit in master
commit in testing
merging testing branch into master
git asterisk test
doing small commit in local branch
Merge branch 'local'

Conflicts:
	paveen
adding new file in old commit
adding something to lolfile
adding some stuff to paveen