changed some names of functions
Merge branch 'master' of https://github.com/afrato/story

Conflicts:
	marist.html
	test.js