change some settings
Merge branch 'master' of https://github.com/arifqodari/CV1_Project

Conflicts:
	src/main.m