misterius errornya -_-
Merge branch 'master' of https://github.com/betaria/speaker-team

Conflicts:
	public/index.html
Merge pull request #17 from LeniHadianti/master

error merging -______________-