helper and nav
Merge branch 'master' into helper
BECAUSE I WANT TO
Merge pull request #3 from olitreadwell/helper

Helper and nav