added to .gitignore
added back .gitignore
Merge branch 'master' of https://github.com/jaredhuling/rfunctions

Conflicts:
	.gitignore