new one line of hobby.txt
add new txt file -> personality.txt
Merge branch 'new_branch'
remove hobby.txt
Conflicts:
	hobby.txt