nodo 12/26 17:30
nodo 12/26 18:57
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch.git

Conflicts:
	imgsearch/src/main/java/org/imgsearch/controller/UserController.java
	imgsearch/src/main/java/org/imgsearch/mapper/UserMapper.java
	imgsearch/src/main/java/org/imgsearch/service/UserService.java