main
Merge branch 'master' of https://github.com/gilzoide/Alg1

Conflicts:
	main.c