Merge pull request #33 from ManyBaby/post-merge-fixes

soldier#index looks good and works well
Merge pull request #34 from ManyBaby/post-merge-fixes

Post merge fixes
wip museo
div.navbar-spacer
wip
Merge pull request #35 from ManyBaby/implement-museo-font

Implement museo font
moved web fonts
navbar-spacer
rm gemfile duplicates
merging with master