3d com resize
Merge branch 'master' of https://github.com/alainmcf/aquatroc

Conflicts:
	templates/home.html