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

Conflicts:
	BeHocThuoc.v11.suo
	BeHocThuoc/obj/Debug/BeHocThuoc.exe
	BeHocThuoc/obj/Debug/BeHocThuoc.pdb
	BeHocThuoc/obj/Debug/XamlTypeInfo.g.cs
	BeHocThuoc/obj/Debug/intermediatexaml/BeHocThuoc.exe
	BeHocThuoc/obj/Debug/intermediatexaml/BeHocThuoc.pdb
fix git ignore