git ignore
Merge https://github.com/Compresso/eyemedia into stewards

Conflicts:
	.gitignore