pulling from upstream
solved merge conflicts
Merge branch 'master' of github.com:fijimunkii/hintr
fix navbar name overlap
Merge pull request #15 from DeProdigy/master

	fixed navbar name overlap