Fixed History on the Nav Bar
Merge branch 'master' of https://github.com/aigazulu/JoeyPizza

Conflicts:
	skills.html