auto_deploy script deploying for mac mié nov 20 21:59:47 CET 2013
Merge branch 'mac'

Conflicts:
	windows/RenegadeKlingon.exe