basic layout in progress

commit to pull in test NPC
Merge branch 'master' of https://github.com/paranoidmarv/WhiteSharks