# �׽�Ʈ
Merge branch 'master' of https://github.com/codepink/nuworld

Conflicts:
	application/config/routes.php