Add script to package.json:
merge changed
Merge branch 'master' of https://github.com/gowaddle/waddle
Merge branch 'master' of https://github.com/gowaddle/waddle
Merge branch 'dev' of https://github.com/gowaddle/waddle
Move filterFeedByBounds to MapFactory and refactor MapFactory
Refactor to pass data between navbar and feed via factory to follow angular best practices