Merge pull request #1 from hadian90/master

amek aku punye
testing lg

haiiiiiiii :*
Merge pull request #2 from faredhadi/master

reemerge