tried replacing generics in story
Fixed problem with scene 1 not showing all of the end text.

Merge branch 'master' of github.com:Myztiq/schitzoadventure

Conflicts:
	public/javascripts/levels/scene1.js
	public/javascripts/levels/scene2.js
	public/javascripts/levels/scene5.js
	public/javascripts/levels/scene6.js
	public/javascripts/levels/scene7.js
Fixed problem with scene 1 not showing all of the end text.

Merge branch 'master' of github.com:Myztiq/schitzoadventure

Conflicts:
	public/javascripts/levels/scene1.js
	public/javascripts/levels/scene2.js
	public/javascripts/levels/scene5.js
	public/javascripts/levels/scene6.js
	public/javascripts/levels/scene7.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/game.js