added numbers to navbar
conflict fix

Conflicts:
	style.css