test 1
Adds user clarkhale to completed.lab
Merge remote-tracking branch 'upstream/master' into chale_username_add

Conflicts:
	completed.lab
Merge branch 'master' into pchriste_test

Conflicts:
	completed.lab
Merge pull request #63 from clarkhale/chale_username_add

Adds user clarkhale to completed.lab
Merge pull request #61 from pchriste/pchriste_test

test 1