max-height proof of concept
Merge branch 'master' into max-height
I changed the max-width behavior in the home page.
I fixed a little bug
merging
Merge branch 'max-height'

Conflicts:
	web/index.html