80% done
Merge pull request #2 from rahayu18/rahayu

80% done