update ignore
Merge branch 'master' of https://github.com/hung-do-mulodo/my-project-01

Conflicts:
	.gitignore