ignore
cleanup continues

Merge branch 'master' of https://github.com/Brewstarke/NLoad_shiny

Conflicts:
	.Rhistory