view mod
Merge branch 'master' of http://github.com/bjw0223/icanc

Conflicts:
	application/views/contents.php
program final_v by sjm
Merge branch 'master' of http://github.com/bjw0223/icanc