Merge branch 'master' of https://github.com/veeyankuh/Relief--Good--Team-UnicornPanduh-S17

Conflicts:
Reliefgood/web/homepage.html
sorry guysss. ayaw isync ni github unless i commit this. :<
huhu. sorry guys. commit ko daw 'to :(
eto riiin. huhu. sorryyy. :'(