canvas 1
Merge branch 'master' of https://github.com/GDGLima/android-tour-web