NSLog2
NSLog3
Merge branch 'NSLog2'

Conflicts:
	TryGit/JJViewController.m

v1.1