CIty
Merge pull request #5 from PrideStalker13/master

CIty
Merge branch 'master' of https://github.com/johnyw4ng/tugas_project1 into johnyw4ng-master

Conflicts:
	public/index.html
Merge pull request #6 from ffemperor99/johnyw4ng-master

Johnyw4ng master
mengedit daily scrum hari ini