merge conflict??
Merge branch 'master' of https://github.com/ysadka/practice_for_git
stephen blows!
Merge branch 'master' of https://github.com/ysadka/practice_for_git

Conflicts:
	new_file.rb