Testing
Fixed
uhh...
Merge branch 'master' of heroku.com:we-fi
Add map link
Fix map maybe
added a bunch of stuff
Merge branch 'master' of heroku.com:we-fi