update script
Merge branch 'master' of github.com:ghorn/OCE-2014

Conflicts:
	oce_script.pdf