test
Merge branch 'master' into board_1
default setting 

Merge branch 'master' into board_1

Conflicts:
	application/controllers/indexController.php
기본 게시판 기능 완성 응헝엏ㅎ헣ㅎ ㅠㅠ 팔콘 더럽게 어렵네
final
Merge branch 'master' of github.com:hamakun/wmp_board

Conflicts:
	application/config/config.php
	cache/volt/_usr_local_var_www_wmp_board_application_views_index.volt.php
	www/index.php