update
Merge branch 'master' of https://github.com/DavidSalzer/wikidots

Conflicts:
	script.js