updates
Merge branch 'master' of github.com:simonrollett/dummy-project
pull frmo master
updated navigation