conflict :(

Signed-off-by: M.Satrya <satryabima24@gmail.com>
commit conflict

Signed-off-by: M.Satrya <satryabima24@gmail.com>
update hybrid

Signed-off-by: M.Satrya <satryabima24@gmail.com>
Merge branch 'master' of github.com:themephe/satu