cleaned up data files
updated files
updates on figure generation
Merge branch 'master' into laptop-branch

Conflicts:
	.Rhistory