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

Conflicts:
	application/js/figureButton.css
	application/views/mainView.php
	application/views/project_page.php