Commit

Commited
Merge branch 'master' of https://github.com/JoaoSisanoski/TheLightAndDark---Game-iOs-Developer

Conflicts:
	LightNDark/LightNDark.xcodeproj/project.pbxproj