Initial check-in.
Merge branch 'master' of github.com:christophertfoo/uhband-video

Conflicts:
	.gitignore