added Q16
fixed
Conflicts:
	RubyQ10-1004
	RubyQ11-1011
	RubyQ12-1018
	RubyQ13-1025
	RubyQ14-1115
	RubyQ5-0614
	RubyQ6-0621
	RubyQ7-0628
	RubyQ8-0705
	RubyQ9-0712
	RubyTest-1004
	RubyTest-1108
	submit/Masahiro1118/.DS_Store
	submit/Masahiro1118/a10.rb
	submit/Masahiro1118/a12.rb
	submit/Masahiro1118/a13.rb
	submit/Masahiro1118/a14.rb
	submit/Masahiro1118/a5.rb
	submit/Masahiro1118/a6.rb
	submit/Masahiro1118/a7.rb
	submit/Masahiro1118/a8.rb
	submit/Masahiro1118/a9.rb
	submit/Masahiro1118/janken
	submit/Masahiro1118/janken_ranking
	submit/Masahiro1118/tail.rb
	submit/Masahiro1118/test.rb
	submit/Masahiro1118/text.txt
	submit/Masahiro1118/wc.rb
	submit/Sairi7/1004.rb
	submit/Sairi7/1011wc.rb
	submit/Sairi7/1018uri.rb
	submit/Sairi7/answer.txt
	submit/Sairi7/answer2.txt
	submit/Sairi7/hit&blow.rb
	submit/Sairi7/mahou.rb
	submit/chinbun/mahoujin
	submit/kyawphyonaing/ruby_test
	submit/moto0121/10-14
	submit/moto0121/RubyQ11-1011.rb
	submit/moto0121/RubyQ12-1018.txt
	submit/moto0121/RubyQ3-0517.txt
	submit/moto0121/RubyQ4-0524.txt
	submit/moto0121/answer.txt
	submit/moto0121/answer2.txt
	submit/phonemyintthu/Magic.rb.txt
	submit/phonemyintthu/New Answer.txt
	submit/phonemyintthu/Q1.txt
	submit/phonemyintthu/Q2.txt
	submit/phonemyintthu/Q3A.txt
	submit/phonemyintthu/Q3B.txt
	submit/phonemyintthu/Q3C.txt
	submit/phonemyintthu/Q4Answer.rb.txt
	submit/phonemyintthu/Ruby12.txt
	submit/rameshpathak/ans1.txt
	submit/rameshpathak/ans2.txt
	submit/rikukyou/RubyTest-1004
	submit/rikukyou/ans-HitAndBlow.txt
	submit/rikukyou/q3
	submit/shiibatoshiki/20140517.txt
	submit/shokei125/1004.txt
	submit/shokei125/answer1004.txt
	submit/shokei125/answer1011.txt
	submit/shokei125/answer1018.txt
	submit/shokei125/answer1025.txt
	submit/shokei125/answer1108.txt
	submit/shokei125/blackjack.txt
	submit/shokei125/hit&blow.txt
	submit/shokei125/poker.txt
	submit/shokei125/typinggame.txt
	submit/sitri/Q1.rb
	submit/sitri/Q11_tail.rb
	submit/sitri/Q11_test.txt
	submit/sitri/Q11_wc.rb
	submit/sitri/Q2.rb
	submit/sitri/Q3.rb
	submit/sitri/RubyTest-1004.rb
	submit/sitri/t.rb
	submit/tarataa/RubyQ1-0426.txt
	submit/tarataa/RubyQ11-1011.txt
	submit/tarataa/RubyQ2-0510.txt
	submit/tarataa/RubyQ3-0517.txt
	submit/tarataa/RubyQ4-0524.txt
	submit/tarataa/rubyTest1004.txt
	submit/tgc129/Dice.rb
	submit/tgc129/Hash.rb
	submit/tgc129/NumberArray.rb
	submit/tgc129/Q-11/Q1.rb
	submit/tgc129/Q-12/Q12.rb
	submit/tgc129/StringArray.rb
	submit/tgc129/ans.txt
	submit/tgc129/ans2.txt
	submit/tgc129/answer.txt
	submit/tgc129/sample.txtMerge branch 'master' of https://github.com/kurosofi/TECH.C

Conflicts:
	RubyQ10-1004
	RubyQ11-1011
	RubyQ12-1018
	RubyQ13-1025
	RubyQ14-1115
	RubyQ5-0614
	RubyQ6-0621
	RubyQ7-0628
	RubyQ8-0705
	RubyQ9-0712
	RubyTest-1004
	RubyTest-1108
	submit/Masahiro1118/.DS_Store
	submit/Masahiro1118/a10.rb
	submit/Masahiro1118/a12.rb
	submit/Masahiro1118/a13.rb
	submit/Masahiro1118/a14.rb
	submit/Masahiro1118/a5.rb
	submit/Masahiro1118/a6.rb
	submit/Masahiro1118/a7.rb
	submit/Masahiro1118/a8.rb
	submit/Masahiro1118/a9.rb
	submit/Masahiro1118/janken
	submit/Masahiro1118/janken_ranking
	submit/Masahiro1118/tail.rb
	submit/Masahiro1118/test.rb
	submit/Masahiro1118/text.txt
	submit/Masahiro1118/wc.rb
	submit/Sairi7/1004.rb
	submit/Sairi7/1011wc.rb
	submit/Sairi7/1018uri.rb
	submit/Sairi7/answer.txt
	submit/Sairi7/answer2.txt
	submit/Sairi7/hit&blow.rb
	submit/Sairi7/mahou.rb
	submit/chinbun/mahoujin
	submit/kyawphyonaing/ruby_test
	submit/moto0121/10-14
	submit/moto0121/RubyQ11-1011.rb
	submit/moto0121/RubyQ12-1018.txt
	submit/moto0121/RubyQ3-0517.txt
	submit/moto0121/RubyQ4-0524.txt
	submit/moto0121/answer.txt
	submit/moto0121/answer2.txt
	submit/phonemyintthu/Magic.rb.txt
	submit/phonemyintthu/New Answer.txt
	submit/phonemyintthu/Q1.txt
	submit/phonemyintthu/Q2.txt
	submit/phonemyintthu/Q3A.txt
	submit/phonemyintthu/Q3B.txt
	submit/phonemyintthu/Q3C.txt
	submit/phonemyintthu/Q4Answer.rb.txt
	submit/phonemyintthu/Ruby12.txt
	submit/rameshpathak/ans1.txt
	submit/rameshpathak/ans2.txt
	submit/rikukyou/RubyTest-1004
	submit/rikukyou/ans-HitAndBlow.txt
	submit/rikukyou/q3
	submit/shiibatoshiki/20140517.txt
	submit/shokei125/1004.txt
	submit/shokei125/answer1004.txt
	submit/shokei125/answer1011.txt
	submit/shokei125/answer1018.txt
	submit/shokei125/answer1025.txt
	submit/shokei125/answer1108.txt
	submit/shokei125/blackjack.txt
	submit/shokei125/hit&blow.txt
	submit/shokei125/poker.txt
	submit/shokei125/typinggame.txt
	submit/sitri/Q1.rb
	submit/sitri/Q11_tail.rb
	submit/sitri/Q11_test.txt
	submit/sitri/Q11_wc.rb
	submit/sitri/Q2.rb
	submit/sitri/Q3.rb
	submit/sitri/RubyTest-1004.rb
	submit/sitri/t.rb
	submit/tarataa/RubyQ1-0426.txt
	submit/tarataa/RubyQ11-1011.txt
	submit/tarataa/RubyQ2-0510.txt
	submit/tarataa/RubyQ3-0517.txt
	submit/tarataa/RubyQ4-0524.txt
	submit/tarataa/rubyTest1004.txt
	submit/tgc129/Dice.rb
	submit/tgc129/Hash.rb
	submit/tgc129/NumberArray.rb
	submit/tgc129/Q-11/Q1.rb
	submit/tgc129/Q-12/Q12.rb
	submit/tgc129/StringArray.rb
	submit/tgc129/ans.txt
	submit/tgc129/ans2.txt
	submit/tgc129/answer.txt
	submit/tgc129/sample.txt