version 36
36
Merge branch 'master' of https://github.com/kanikab/PhpProject1

Conflicts:
	story.php