second
yes solve the confict
Merge branch 'master' of https://github.com/jolanxiao/firstProject

Conflicts:
	dairylog