main page
Merge branch 'master' of https://github.com/lelelewy/TheJar

Conflicts:
	html_template/index.html
delete

conflict