ini di edit
Merge branch 'master' of github.com:igrir/Tanyoo

Conflicts:
	application/controllers/tanyoo.php
ni di edit