Add script to package.json:
merge changed
Merge branch 'master' of https://github.com/gowaddle/waddle
Merge pull request #209 from vreddy18/master

Re-style front page; UI improvements
Add suboptimal quickfix to reloading feed immediately on my bucketlist click using rootscope
Add state change
Comment and clean loadBucketlist
Merge pull request #210 from gitMbar/dev

Quickfix for reloading feed immediately on 'my bucketlist' click
Fix syntax error
Merge pull request #211 from gitMbar/dev

Fix syntax error
Merge pull request #213 from vreddy18/master

Improve UI
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
Update README.md
Update README.md
Merge pull request #214 from gitMbar/dev

Update README
fix merge conflicts.