?
?
Merge branch 'master' of https://github.com/betaria/speaker-team

Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/betaria/speaker-team
Merge pull request #20 from LeniHadianti/master

perbaikan error merging