Merge pull request #1 from mmcnierney14/graphs

@matt Graphs
dont track ds store
fix merge conflict
added delete button to the displayentryactivity
fix lib location
start location inference
Merge pull request #2 from mmcnierney14/delete-button

@nicole added delete button to the displayentryactivity
shows closest wifi name on manual input
show bathroom name inferred from wifi data
Merge pull request #3 from mmcnierney14/location-inference

@nicole-hedley => Location inference
Merge pull request #4 from mmcnierney14/graphs

Diana's 2nd pull request @matt @nicole
fix merge conflicts
show unknown bathroom if bathroom is null