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
Resolve conflict and merge
Delete helper loged?
resolve merge with users
resolve merge with museums
merge museums
Merge Achievements with Develop
resolve merge users
resolve merge with users spe 2