commits uncommitted code before merge
Merge branch 'master' of https://github.com/johndangerstorey/xoisland

* 'master' of https://github.com/johndangerstorey/xoisland:
  Markus Edit
adds top nav bar