Linked up driver side of app and rick side of app by driver id. Loading template for when data is not ready
Merge branch 'base_app' of https://github.com/alanchiao/zbt-rush-app into base_app
Did same thing as you and merged with self lol

Conflicts:
	rush_app/server/publications.js