debugging
Trying to fix my mess

Merge branch 'master' of https://github.com/ebailey78/shinyBS

Conflicts:
	R/bsNav.R