Temp fix
Merge branch 'master' of http://github.com/qwazerty/config

Conflicts:
	global_link.sh