Standardize White Space

Conflicts:
	qa.sh