create user.rb
pull main.rb and merge lib/user.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	lib/user.rb
collision test main.rb
collision test lib/user.rb
add new img
temp
Merge branch 'yanagida'

Conflicts:
	lib/user.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
update main.rb and lib/user.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	lib/user.rb
	main.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
Change lib/map.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
Chenge lib/map.rb
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1
solve a Collison