Kavya Committing: Not Crazy
Merge remote branch 'origin/master'

Conflicts:
	hello.c