new changes in main
Merge branch 'master' into samtestbranch

Conflicts:
	main.py