final attempt to fix mobile scroll
remove margin from nav
Merge branch 'master' of github.com:dwanderton/diamondhairsalon

Conflicts:
	index copy.html
	index.html