pwd
currentchallenge
Merge branch 'master' into post

Conflicts:
	Gemfile
test
Merge branch 'post'

Conflicts:
	Gemfile