change before commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/submitpaper.html
Merge branch 'master' of https://github.com/hisyamidris/WPTC
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/submitpaper.html