ミクのくじびきやったら、でかいのあたった
Merge branch 'master' of https://github.com/MMGP2014/2dsa

Conflicts:
	2dsa/main.cpp
Merge branch 'master' of https://github.com/MMGP2014/2dsa

Conflicts:
	2dsa/first_stg.cpp
	2dsa/main.cpp
ｗｗ
Merge branch 'master' of https://github.com/MMGP2014/2dsa

Conflicts:
	2dsa/first_stg.cpp
	2dsa/main.cpp
	2dsa/main.cpp~
ああ」
ああ
Merge branch 'master' of https://github.com/MMGP2014/2dsa

Conflicts:
	2dsa/first_stg.cpp
	2dsa/prot.h
さ
Merge branch 'master' of https://github.com/MMGP2014/2dsa
ｈｇｇ
ｋｋ
gg