hello.php 삭제
Merge branch 'codeigniter'

Conflicts:
	hello.php
Merge branch 'codeigniter'
삭제  function  추가