change
Merge branch 'master' of https://github.com/herokes/Project_BV

Conflicts:
	QLBV_normal/QLBV_normal/NgoaitruFormnew.Designer.cs
	QLBV_normal/QLBV_normal/NgoaitruFormnew.cs
	QLBV_normal/QLBV_normal/PhieuxetnghiemForm.cs
ah c