iiii
Merge branch 'master' of https://github.com/neonankiti/Shotoku
koudesu
Conflicts:
	application/views/user/exihibition.php
	application/views/user/history.php
	css/user/base.css
Merge branch 'master' of https://github.com/neonankiti/Shotoku
i