Initial import
Merge branch 'master' of github.com:dramalho/media_archiver

Conflicts:
	.gitignore