add chapter1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	hellowern/chapter1/.gitignore
	hellowern/chapter1/config/initializers/secret_token.rb

:q
::q
Merge pull request #31 from Hellowern/master

fix conflict