File check.
Check Darwin.
Merge branch 'rollback'

Conflicts:
	.bashrc