laptop update
test
from laptop out of sync
reloading test file
laptop
Merge branch 'master' of https://github.com/jorton818/test

Conflicts:
	test_doc.md