念のためのコミット
Make a basic User model (including secure passwords)
Finish user signup
Finish static pages

FixCommmit
Make a basic User model (including secure passwords)
Finish user signup
push to git hub

FixCommit

FixCommit

FixCommit
Merge branch 'first_push_to_git-hub'

Conflicts:
	.idea/workspace.xml
	app/helpers/users_helper.rb
Finish sign in