SETUP MY MACHINE AT WORK
Merge branch 'master' into ERIX_MAC_WORK

Conflicts:
	.gitignore
	.profile
Merge pull request #1 from eblincow/ERIX_MAC_WORK

MOVING TO A MAC_FRIENDLY SETUP