first commit in static_pages branch
"pull static_pages branch"
Merge branch 'static_pages' of github.com:gaoch/sample into static_pages

Conflicts:
	Gemfile