started modifiying nav
merged changes
Merged changes
Merge branch 'master' of github.com:Tambling/whetstone into development-fix-navigation
changed css