here we go
all
Merge branch 'abhisar' of https://github.com/rajeshnepal/tranning2013 into abhisar

Conflicts:
	file3.txt~