added .gitignore
updated
Merge branch 'master' of https://github.com/federman/slides

Conflicts:
	.gitignore