heidi
Merge branch 'master' of https://github.com/troylanigan/heidi
editted navbar positioning