save changes
Merge branch 'gh-pages' of https://github.com/philwinne/nstudy2_public into gh-pages

Conflicts:
	friday_layout/nav.html