Finish demo app 2
Add a StaticPages controller
chapter 3
chapter 3
Merge branch 'static-pages'

Conflicts:
	first_app.iml