Added screen-build to automate/remind me to use screen
Manual merge complete.

Conflicts:
	build