ss
Merge https://github.com/wooGuk/project

Conflicts:
	application/js/canvas.js
	application/js/figureButton.css
	application/js/shapeList.js
	application/js/socket.js
	application/views/login_page.php
	application/views/mainView.php
	application/views/project_list_page.php
	application/views/project_page.php