working on the font of the lions menu
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
added reset.css and refactored menu.css to compensate for the reset