?  lot of .Rproj stuff that should be ignored
more crap

Merge branch 'develop' of https://github.com/dyerlab/gstudio into develop

Conflicts:
	.Rproj.user/A5EA2B90/pcs/files-pane.pper
	.Rproj.user/A5EA2B90/pcs/windowlayoutstate.pper
	.Rproj.user/A5EA2B90/sdb/prop/INDEX