polish, nav bar
merged
Merge remote-tracking branch 'origin/master' into matt2

Conflicts:
	.DS_Store
attemps to fix escape characters