Merge pull request #13 from tabosque/develop

Merge
Merge remote branch 'origin/develop'
Merge pull request #16 from tabosque/develop

Develop
Merge branch 'master' of https://github.com/tabosque/sample_app
Merge branch 'filling-in-layout'
Merge branch 'shared-examples'
Merge pull request #19 from tabosque/develop

Finish Section 5
Merge branch 'check-email'
Merge pull request #22 from tabosque/develop

Finish Section 6
Finish user signup
Merge branch 'sign-up'
Merge pull request #23 from tabosque/sign-up

Finish user signup
Merge branch 'tmp'
Commit fixed
Merge pull request #25 from tabosque/tmp2

Tmp2