sua giao dien
Merge branch 'master' of github.com:khanhminh/CellPhoneShop

Conflicts:
	cellphoneshop/src/main/webapp/WEB-INF/jsp/demo.jsp
Merge branch 'master' of github.com:khanhminh/CellPhoneShop

Conflicts:
	cellphoneshop/src/main/java/cellphoneshop/controller/DemoController.java
trang chu