updates
Merge branch 'develop'
Merge branch 'release/0.1'

Conflicts:
	.ruby-version
	Gemfile.lock
Merge branch 'release/layout'
Merge branch 'release/user-model'
Merge branch 'release/sign-up'