Initial import
Merge branch 'master' of github.com:akupila/PXL-video-app

Conflicts:
	.gitignore