git merg git merg
Merge branch 'master' of https://github.com/JoaoSisanoski/Projeto-iOs

Conflicts:
	LightNDark/LightNDark/LampMechanics.m
ok
?