Routing and bookmarking MUCH improved
Merge branch 'development' of github.com:TaliaS1214/discover_app into development