modificado local
Merge branch 'new_branch' of github.com:yammusic/blog into v2

Conflicts:
	new_file_test.md