first commit
Merge branch 'master' of github.com:cwyark/CasparCG-Scheduler

Conflicts:
	.gitignore