changwoo
Merge branch 'master' of https://github.com/ChangwooPark/MusicStore

Conflicts:
	MusicStore/build/classes/com/MusicStore/Controller/MemberController.class
	MusicStore/build/classes/com/MusicStore/daoImpl/MemberDAOImpl.class
	MusicStore/src/main/java/com/MusicStore/Controller/MemberController.java
	MusicStore/src/main/java/com/MusicStore/daoImpl/MemberDAOImpl.java
	MusicStore/src/main/webapp/WEB-INF/views/Template/Header.jsp