Added navigation logic
Merge branch 'master' of https://github.com/burntblark/shopper.git