dqqdsqdsqds
Merge branch 'master' of https://github.com/azertyx/Yoho

Conflicts:
	application/views/template.php
Merge branch 'master' of https://github.com/azertyx/Yoho