new site
delete tmp
conflict database
pass database
Merge branch 'design'
gemfile
Merge branch 'master' of github.com:hermanos/audioguide into develop
New QrCode