fixed double button in header
Merge remote-tracking branch 'origin/master' into eric
Fixed links and dropdown ...
* would like to have dropdown not extend entire navbar
Merge pull request #4 from EricKutschera/eric

The dropdown displays now
resolving merge conflicts