Remove fixed top bar bottom margin
updated conflicts
Merge branch 'master' of github.com:zurb/foundation