added gitignore
resolving merge conflict

Merge branch 'master' of rmflightGithub:rmflight/timmysDensity

Conflicts:
	.gitignore
finishing off the vignette