commit
Merge branch 'master' of https://github.com/alexhoanghtd/IRENEOS

Conflicts:
	.gitignore
commit TrungNT