test 1
Merge branch 'master' into pchriste_test

Conflicts:
	completed.lab
Merge pull request #61 from pchriste/pchriste_test

test 1