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

Conflicts:
	public/index.html
	public/javascripts/levels/scene1.js
	public/styles/styles.less
Merge branch 'master' of github.com:Myztiq/schitzoadventure
herped around with dialogue
Merge branch 'master' of github.com:Myztiq/schitzoadventure
herped around with dialogue
Merge branch 'master' of github.com:Myztiq/schitzoadventure
herped around with dialogue
Merge branch 'master' of github.com:Myztiq/schitzoadventure
Got a very basic dialogue engine up
Merge branch 'master' of github.com:Myztiq/schitzoadventure