123
Merge branch 'master' of https://github.com/caiohsr14/gitloko

Conflicts:
	test.c