link typo on made in
Merge remote-tracking branch 'upstream/master'

Conflicts:
	made-in/index.html