writing test for active navbar element
fix merge conflict
Merge branch 'master' of github.com:estiens/crowdfunder
update flow
making test for active navbar element pass