updated .gitignore to ignore *.DS_Store and *.orig
merge conflict with .git-ignore

Merge branch 'master' of github.com:beanumber/oiLabs into mosaic

Conflicts:
	.gitignore
added link to Minimal R to Lab 0 and clarified Q2