navbar shenanigans
Merge branch 'master' of https://github.com/michellechanvc/brickbreaker

Conflicts:
	index.html