Onward to number 4

At the end I didn't feel like making up a function for links to
wikipedia, so I just made a list of iframes instead
Merge remote-tracking branch 'origin/master'

Conflicts:
	3/3.html
	3/myscript.js