added .gitignore
Merge branch 'master' of https://github.com/bbloomf/christmas-carols

Conflicts:
	.gitignore