Fixed typo - Missing ','
Fixed the homepage link
Merge branch 'master' into udp

Conflicts:
	package.json