commented codes causing error to the server
Merge branch 'master' of github.com:mikaelvg/bayanihan
Merge branch 'master' into AldwinDelgado