First commit
Merge branch 'master' of github.com:kapouille/MediaSync

Conflicts:
	.gitignore