Merge branch 'exercise6_5_1'
Merge branch 'exercise6_5_2'
Merge branch 'exercise6_5_3'
Merge branch 'master' of github.com:Tacahilo/sample_app