initial commit comment
Merge branch 'master' of https://github.com/captain-miao/FragmentTutorial

Conflicts:
	.gitignore
	.git/MERGE_HEAD