rb
before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	nguser.txt
	tabata.rb