git doesnt like single-quotes
Merge branch 'master' into moar-recursion

Conflicts:
	push.sh