main
tMerge branch 'mainMove'

Conflicts:
	images/hsnumc.png
back