Merge pull request #4 from Janward/master

prototype tampilan
Merge pull request #1 from davidbezalel/master

Merge pull request #14 from Janward/master
Merge pull request #5 from Janward/master

yang terselip