added to gitignore
Merge branch 'master' of https://github.com/mjafshar/tosche-station-mobile
resolving merge conflicts
added button to view map
added navigation at top of Discover tab to view map
added button to return to facts
Merge pull request #36 from mjafshar/view_map_button

View map button