nodo 12/31 14:06
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch.git

Conflicts:
	imgsearch/src/main/webapp/WEB-INF/views/img/menubutton.jsp
nodo 12/31 14:30