adsfafa
Merge branch 'master' of https://github.com/Laaia/teste

Conflicts:
	main.c