resolving conflicts
Merge branch 'master' of github.com:luke-ohara/wi_finder
rerouting home back to map function for better UI