modified:   a.out
	modified:   stack.c
Merge branch 'test_branch'

Conflicts:
	a.out
	stack.c