test.
Test for master branch
Merge branch 'FileOrginizer'
test
Merge branch 'RefactorClassName'

Conflicts:
	ControllingSource/DetailViewController.m
Merge branch 'master' into FileOrginizer
test for stash
commit in stash
test after stash