working on other branch
Merge branch 'manish'

Conflicts:
	a.c