kk
Merge branch 'master' of github.com:neonankiti/Shotoku
i
Conflicts:
	application/views/user/news.php