Before big merge.
Merging.

Merge remote-tracking branch 'origin/master'

Conflicts:
	.Rhistory
Merge working.
Merge remote-tracking branch 'origin/master'
Fixed partitions.
Almost perfect.
Final version. I want to sleep.