Adding .gitignore
Merging changes.
Reverting a few local changes.
Merge branch 'avconv'

Conflicts:
	.gitignore