Closing Trail Data
Merge branch 'master' of https://github.com/johnsiwicki/ratchet-demo-app

Conflicts:
	scripts.html