Fixed
Merge branch 'master' of github.com:allaeia/perception_manipulation_protection_image

Conflicts:
	main.m