fixing conflict
Merge branch 'list-view' of https://github.com/SpaceLabForever/alongtheway into list-view
Updating View Layer
Fixing merge conflicts
adding to .gitignore
Merge branch 'master' into list-view