Updated profile'
Merge branch 'master' of github.com:DavidPeek/workspace

Conflicts:
	script/profile.sh