init commit
update gitignore
Merge branch 'master' of github.com:quyenlq/behocthuoc

Conflicts:
	.gitignore