test# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/EverNever/MineClass

Conflicts:
	main/templates/hello.html