Updates
Merge branch 'master' of github.com:CanTireInnovations/treads

Conflicts:
	client/app/index.html