coffee deleted
config modified
conflicts solved
retouch
conflicts resolved
merge with branch users
resolve merge
resolve merge
resolve
retuch routes and add links to museums pages
Merge branch 'museums' of github.com:hermanos/audioguide into museums
add seeds
Merge model exhibits
Resolve confilcts