Merge pull request #13 from hairizalman/master

Merge pull request #40 from dianaismail/master
Merge pull request #14 from hairizalman/master

merge from hairizalman/myspata
salinplan_model
Merge pull request #42 from dianaismail/master

merge from hairizalman/myspata