testing sentence sending
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory

Conflicts:
	app.js