Merge branch 'pr/1'
Merge pull request #2 from Pau1005/master

pau and rhenz
Merge branch 'pr/3'
//RHENZ
Merge branch 'pr/3'
//RHENZ
Merge branch 'master' into pr/2
//comment ni pau kahit busy siya