Changed value to 3
Changed value to 1
Merge branch 'testing'

Conflicts:
	TestProject/ViewController.m