working on navigation
Merge pull request #18 from me33dy/colin

working on navigation