hit test user to pipe
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	lib/game.rb
	lib/map.rb
	lib/user.rb