second commit
Merge branch 'master' of https://github.com/cle596/test

Conflicts:
	a.out
	main.c