new navigation menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	BaseHTML/grid-template.html
Merge branch 'master' of https://github.com/mytcg/SuperCars