showing tutorial.
fixing bugs
Merge branch 'staging'