Modifying the stub.
Merge branch 'master' of github.com:geoffreywoo/otoro

Conflicts:
	otoro.js
Got received to work.
Merge branch 'master' of github.com:geoffreywoo/otoro