Initial commit
Merge branch 'master' of github.com:sally1016/sample_app

Conflicts:
	README.md
Add a StaticPages controller
Finish static pages