マップ(map01.dat)の追加
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1 into kurumada

Conflicts:
	images/map01.dat
Generated map and scroll
Merge branch 'kurumada'

Conflicts:
	lib/user.rb
	main.rb