test basic changes
Merge branch 'master' into samtestbranch

Conflicts:
	main.py
fixing merge
just making more changes
I really only want 2000 at a time
Merge branch 'master' into samtestbranch
new changes
taking merge from main
merge fixes
Merge branch 'samtestbranch'