add video and timeline model
Merge branch 'master' of https://github.com/zachlevy/asynchealth

Conflicts:
	Gemfile.lock