added proximity ui stuff and relocate container
Merge pull request #53 from amelialaundy/prox_ui

added proximity ui stuff and relocate container
Merge branch 'dev_branch' into ruby_testing