preparing navlinks for publish push
Merge branch 'master' of github.com:tkwidmer/refugerestrooms
Clean up Gemfile
Remove nearby action on bathrooms collection
Add pry and quiet assets to Gemfile in test and dev
Remove guess action on bathrooms collection
Merge pull request #120 from RefugeRestrooms/cleanup-gemfile

Cleanup gemfile
Merge remote-tracking branch 'upstream/master' into feature/fold-bathroom-collection-actions-into-index
Add acceptance test for map display of restrooms
changed erb files to haml
Remove list action on bathrooms collection
Add missing Cucumber map steps
Merge pull request #121 from RefugeRestrooms/feature/fold-bathroom-collection-actions-into-index

Fold bathroom collection actions into index
simplifying haml
merging changes
remove html2haml from gemfile
Merge pull request #122 from RefugeRestrooms/erb_to_haml

Erb to haml
Merge branch 'master' into develop
Merge branch 'master' into develop