made a change where li's are not fixed, but nav is. Remember to share with lorenzo
saved changes to the nav
incorporating Sam's changes
Merge branch 'samkap-master'

Conflicts:
	stylesheets/stylesheet.css.map