commit merge
Merge branch 'master' of https://github.com/JoaoSisanoski/Projeto-iOs

Conflicts:
	LightNDark/LightNDark.xcodeproj/project.pbxproj
	LightNDark/LightNDark/LampMechanics.h
	LightNDark/LightNDark/LampMechanics.m
3