added conversation pages
Merge branch 'master' of https://github.com/lingtong-sun/The-Three-Amigos

Conflicts:
	app.js