finished pages
Merge branch 'master' of https://github.com/strangesponge/sample_app

Conflicts:
	Gemfile.lock