như nào
chả hiểu sao nó bắt commit cái này :|

Conflicts:

	C1208GS4G2eProject/build/generated/classes/org/apache/jsp/Login_jsp.class

	C1208GS4G2eProject/build/generated/src/org/apache/jsp/Login_jsp.class.smap
	C1208GS4G2eProject/build/generated/src/org/apache/jsp/Login_jsp.java
	C1208GS4G2eProject/nbproject/private/private.properties
	C1208GS4G2eProject/nbproject/private/private.xml