max height fix
Merge branch 'gh-pages' of https://github.com/bgreater/MGP-prototype into gh-pages

Conflicts:
	css/mgp-main.css