allmywork
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
application/views/signin.php
clear
clear again