fix
fix [reso conflict]

Conflicts:
	Lieutenant/Lieutenant/ViewController.m