Updated CSS link and Nav working
Merge branch 'shaneBranch' of https://github.com/jbbrokaw/sloppy-donkey into samBranch

Conflicts:
	about.html
	booking.html
	buy-tix(1).html
	home.html
	merch.html
	upcomingshows.html
Merge pull request #4 from jbbrokaw/samBranch

add logo and color
Merge branch 'shaneBranch'
correction
Correct bad merge
Merge pull request #5 from jbbrokaw/shaneBranch

Correct bad merge
Merge branch 'master' of https://github.com/jbbrokaw/sloppy-donkey into samBranch

Conflicts:
	about.html
	booking.html
	buy-tix(1).html
	home.html
	merch.html
	upcomingshows.html