Just giving a bit more dialogue
Merge branch 'master' of github.com:lazarillo/test

Conflicts:
	main.c