debug checkpoint - wip
Merge branch 'master' of github.com:onefinestay/rendezvous

Conflicts:
	app.js