video
no message
Merge branch 'master' of github.com:mezderman/hackathon

Conflicts:
	.DS_Store
vid